diff --git a/src/core/network-openssl.c b/src/core/network-openssl.c
index 3b0f3c18..fc729dde 100644
--- a/src/core/network-openssl.c
+++ b/src/core/network-openssl.c
@@ -565,7 +565,8 @@ static GIOChannel *irssi_ssl_get_iochannel(GIOChannel *handle, int port, SERVER_
 	return gchan;
 }
 
-GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify)
+GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port,
+                                  IPADDR *ip, IPADDR *my_ip, SERVER_REC *server)
 {
 	GIOChannel *handle, *ssl_handle;
 
diff --git a/src/core/network.h b/src/core/network.h
index c88e9bc0..a7804b1a 100644
--- a/src/core/network.h
+++ b/src/core/network.h
@@ -41,7 +41,7 @@ int net_ip_compare(IPADDR *ip1, IPADDR *ip2);
 GIOChannel *net_connect(const char *addr, int port, IPADDR *my_ip);
 /* Connect to socket with ip address and SSL*/
 GIOChannel *net_connect_ip(IPADDR const *ip, int port, IPADDR *my_ip);
-GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, const char *cert, const char *pkey, const char *cafile, const char *capath, gboolean verify);
+GIOChannel *net_connect_proxy_ssl(struct network_proxy const *proxy, char const *host, int port, IPADDR *ip, IPADDR *my_ip, SERVER_REC *server);
 
 int irssi_ssl_handshake(GIOChannel *handle);
 /* Connect to socket with ip address */
diff --git a/src/core/servers.c b/src/core/servers.c
index c8183675..dbc8ae49 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -225,10 +225,7 @@ static void server_real_connect(SERVER_REC *server, IPADDR *ip,
 			net_connect_proxy_ssl(server->connrec->proxy,
 					      server->connrec->address, port,
 					      ip, own_ip,
-					      server->connrec->ssl_cert,
-					      server->connrec->ssl_pkey,
-					      server->connrec->ssl_cafile,
-					      server->connrec->ssl_capath, server->connrec->ssl_verify) :
+					      server->connrec) :
 			net_connect_proxy(server->connrec->proxy,
 					  server->connrec->address, port,
 					  ip, own_ip);
diff --git a/src/irc/core/irc-servers.c b/src/irc/core/irc-servers.c
index 5bac1445..284f2b6e 100644
--- a/src/irc/core/irc-servers.c
+++ b/src/irc/core/irc-servers.c
@@ -341,6 +341,11 @@ void irc_server_connect(SERVER_REC *server)
 	}
 }
 
+void irc_send_cmd_now_wrapper(void *server, const char *cmd)
+{
+	return irc_send_cmd_now((IRC_SERVER_REC *)server, cmd);
+}
+
 /* Returns TRUE if `command' is sent to `target' */
 static int command_has_target(const char *cmd, const char *target)
 {
diff --git a/src/irc/core/irc-servers.h b/src/irc/core/irc-servers.h
index 41c4b9c2..7da1ab39 100644
--- a/src/irc/core/irc-servers.h
+++ b/src/irc/core/irc-servers.h
@@ -136,6 +136,8 @@ void irc_server_send_away(IRC_SERVER_REC *server, const char *reason);
 void irc_server_send_data(IRC_SERVER_REC *server, const char *data, int len);
 void irc_server_init_isupport(IRC_SERVER_REC *server);
 
+void irc_send_cmd_now_wrapper(void *server, const char *cmd);
+
 void irc_servers_start_cmd_timeout(void);
 
 void irc_servers_init(void);