diff --git a/include/connio.h b/include/connio.h
index cd35849..e5e86c4 100644
--- a/include/connio.h
+++ b/include/connio.h
@@ -240,7 +240,7 @@ BOOL ConnAddressPoolRemoveSockAddr(AddressPool *pool, struct sockaddr_in *addr);
 BOOL ConnAddressPoolRemoveHost(AddressPool *pool, char *hostName, unsigned short hostPort);
 Connection *ConnAddressPoolConnect(AddressPool *pool, unsigned long timeOut);
 
-BOOL ConnStartup(unsigned long TimeOut, BOOL EnableSSL);
+BOOL ConnStartup(unsigned long TimeOut);
 void ConnShutdown(void);
 
 void ConnSSLContextFree(bongo_ssl_context *Context);
@@ -258,8 +258,8 @@ IPSOCKET ConnConnect(Connection *conn, struct sockaddr *saddr, socklen_t slen, b
 int ConnEncrypt(Connection *conn, bongo_ssl_context *context);
 BOOL ConnNegotiate(Connection *conn, bongo_ssl_context *Context);
 
-int ConnClose(Connection *Conn, unsigned long Flags);
-void ConnCloseAll(unsigned long Flags);
+int ConnClose(Connection *Conn);
+void ConnCloseAll();
 
 void ConnFree(Connection *Conn);
 
diff --git a/src/agents/antispam/antispam.c b/src/agents/antispam/antispam.c
index bd8cd4b..b7fd323 100644
--- a/src/agents/antispam/antispam.c
+++ b/src/agents/antispam/antispam.c
@@ -252,7 +252,7 @@ AntispamServer() {
                                             ProcessConnection,
                                             &ASpam.QueueMemPool);
     BongoThreadPoolShutdown(ASpam.QueueThreadPool);
-    ConnClose(ASpam.QueueConnection, 1);
+    ConnClose(ASpam.QueueConnection);
     BongoAgentShutdown(&ASpam.agent);
 }
 
diff --git a/src/agents/avirus/avirus.c b/src/agents/avirus/avirus.c
index 32f9a12..21a765d 100755
--- a/src/agents/avirus/avirus.c
+++ b/src/agents/avirus/avirus.c
@@ -505,7 +505,7 @@ AntiVirusServer(void *ignored) {
                                             ProcessConnection,
                                             &AVirus.QueueMemPool);
     BongoThreadPoolShutdown(AVirus.QueueThreadPool);
-    ConnClose(AVirus.QueueConnection, 1);
+    ConnClose(AVirus.QueueConnection);
     BongoAgentShutdown(&AVirus.agent);
 }
 
diff --git a/src/agents/imap/imapd.c b/src/agents/imap/imapd.c
index 17364da..1d1196a 100644
--- a/src/agents/imap/imapd.c
+++ b/src/agents/imap/imapd.c
@@ -154,7 +154,7 @@ IMAPShutdown(unsigned char *Arguments, unsigned char **Response, BOOL *CloseConn
                     Imap.exiting = TRUE;
 
                     if (Imap.server.conn) {
-                        ConnClose(Imap.server.conn, 1);
+                        ConnClose(Imap.server.conn);
                         Imap.server.conn = NULL;
                     }
 
@@ -803,7 +803,7 @@ SessionCleanup(ImapSession *session)
         if (session->store.conn) {
             if (session->store.conn->socket != -1) {
                 NMAPSendCommand(session->store.conn, "QUIT\r\n", 6);
-                ConnClose(session->store.conn, 1);
+                ConnClose(session->store.conn);
                 session->store.conn->socket = -1;
             }
 
@@ -814,7 +814,7 @@ SessionCleanup(ImapSession *session)
         if (session->client.conn) {
             if (session->client.conn->socket != -1) {
                 ConnFlush(session->client.conn);
-                ConnClose(session->client.conn, 1);
+                ConnClose(session->client.conn);
                 session->client.conn->socket = -1;
             }
 
@@ -3282,7 +3282,7 @@ IMAPShutdownSigHandler(int sigtype)
         signaled = Imap.exiting = TRUE;
 
         if (Imap.server.conn) {
-            ConnClose(Imap.server.conn, 1);
+            ConnClose(Imap.server.conn);
             Imap.server.conn = NULL;
         }
 
@@ -3483,25 +3483,25 @@ IMAPServer(void *unused)
                         }
                 
                         ConnSend(conn, "* BYE IMAP server out of memory\r\n", strlen("* BYE IMAP server out of memory\r\n"));
-                        ConnClose(conn, 1);
+                        ConnClose(conn);
                         ConnFree(conn);
                         continue;
                     }
 
                     ConnSend(conn, "* BYE IMAP connection limit for this server reached\r\n", strlen("* BYE IMAP connection limit for this server reached\r\n"));
-                    ConnClose(conn, 1);
+                    ConnClose(conn);
                     ConnFree(conn);
                     continue;
                 }
 
                 ConnSend(conn, "* BYE IMAP access to this server currently disabled\r\n", strlen("* BYE IMAP access to this server currently disabled\r\n"));
-                ConnClose(conn, 1);
+                ConnClose(conn);
                 ConnFree(conn);
                 continue;
             }
             
             ConnSend(conn, "* BYE IMAP server shutting down\r\n", strlen("* BYE IMAP server shutting down\r\n"));
-            ConnClose(conn, 1);
+            ConnClose(conn);
             ConnFree(conn);
             break;
         }
@@ -3532,7 +3532,7 @@ IMAPServer(void *unused)
     oldTGID = XplSetThreadGroupID(Imap.server.threadGroupId);
 
     if (Imap.server.conn) {
-        ConnClose(Imap.server.conn, 1);
+        ConnClose(Imap.server.conn);
         Imap.server.conn = NULL;
     }
 
@@ -3541,7 +3541,7 @@ IMAPServer(void *unused)
 #endif
 
     if (Imap.server.ssl.conn) {
-        ConnClose(Imap.server.ssl.conn, 1);
+        ConnClose(Imap.server.ssl.conn);
     }
 
     /*    Wake up the children and set them free!    */
@@ -3656,13 +3656,13 @@ IMAPSSLServer(void *unused)
                     if (ConnWrite(conn, message, messageLen) != -1) {
                         ConnFlush(conn);
                     }
-                    ConnClose(conn, 1);
+                    ConnClose(conn);
                     ConnFree(conn);
                     continue;
                 } 
 
                 ConnSend(conn, message, messageLen);
-                ConnClose(conn, 1);
+                ConnClose(conn);
                 ConnFree(conn);
                 continue;
             }
@@ -3782,7 +3782,7 @@ XplServiceMain(int argc, char *argv[])
 
     InitializeImapGlobals();
 
-    ConnStartup(IMAP_CONNECTION_TIMEOUT, TRUE);
+    ConnStartup(IMAP_CONNECTION_TIMEOUT);
 
     MsgInit();
     MsgAuthInit();
diff --git a/src/agents/pop/pop3.c b/src/agents/pop/pop3.c
index 19252ad..19882b1 100644
--- a/src/agents/pop/pop3.c
+++ b/src/agents/pop/pop3.c
@@ -729,7 +729,7 @@ POP3CommandAuth(void *param)
     }
     else {
         /* fixme - we need connection management flags for ConnClose to force the shutdown */
-        ConnClose(client->conn, 1);
+        ConnClose(client->conn);
         ConnFree(client->conn);
         client->conn = NULL;
         return(ccode);
@@ -924,7 +924,7 @@ POP3CommandPass(void *param)
         }
 
         /* fixme - we need connection management flags for ConnClose to force the shutdown */
-        ConnClose(client->conn, 1);
+        ConnClose(client->conn);
         ConnFree(client->conn);
         client->conn = NULL;
 
@@ -1003,7 +1003,7 @@ POP3CommandPass(void *param)
     }
     else {
         /* fixme - we need connection management flags for ConnClose to force the shutdown */
-        ConnClose(client->conn, 1);
+        ConnClose(client->conn);
         ConnFree(client->conn);
         client->conn = NULL;
         return(ccode);
@@ -1045,7 +1045,7 @@ POP3CommandQuit(void *param)
         ConnWriteF(client->conn, "-ERR %s %d, %s\r\n", MSGERRINTERNAL, lastccode, MSGOKBYE);
 
     ConnFlush(client->conn);
-    ConnClose(client->conn, 0);
+    ConnClose(client->conn);
     ConnFree(client->conn);
     client->conn = NULL;
 
@@ -1229,7 +1229,7 @@ POP3CommandSTLS(void *param)
         result = ConnNegotiate(client->conn, POP3.server.ssl.context);
         if (!result) {
             /* fixme - we need connection management flags for ConnClose to force the shutdown */
-            ConnClose(client->conn, 1);
+            ConnClose(client->conn);
             ConnFree(client->conn);
             client->conn = NULL;
         }
@@ -1518,7 +1518,7 @@ HandleConnection(void *param)
 
             if (ccode == -1) {
                 /* fixme - we need connection management flags for ConnClose to force the shutdown */
-                ConnClose(client->conn, 1);
+                ConnClose(client->conn);
                 ConnFree(client->conn);
                 client->conn = NULL;
             }
@@ -1569,7 +1569,7 @@ HandleConnection(void *param)
         }
 
         if (client->conn) {
-            ConnClose(client->conn, 0);
+            ConnClose(client->conn);
             ConnFree(client->conn);
         }
 
@@ -1730,7 +1730,7 @@ POP3Server(void *ignored)
             }
 
             /* fixme - we need connection management flags for ConnClose to force the shutdown */
-            ConnClose(conn, 1);
+            ConnClose(conn);
 
             ConnFree(conn);
             conn = NULL;
@@ -1773,13 +1773,13 @@ POP3Server(void *ignored)
 
     if (POP3.server.conn) {
         /* fixme - we need connection management flags for ConnClose to force the shutdown */
-        ConnClose(POP3.server.conn, 1);
+        ConnClose(POP3.server.conn);
         POP3.server.conn = NULL;
     }
 
     Log(LOG_DEBUG, "Standard listener down.");
     /* fixme - we need connection management flags for ConnClose to force the shutdown */
-    ConnCloseAll(1);
+    ConnCloseAll();
 
     XplWaitOnLocalSemaphore(POP3.client.semaphore);
 
@@ -1814,7 +1814,7 @@ POP3Server(void *ignored)
 
         if (POP3.server.ssl.conn) {
             /* fixme - we need connection management flags for ConnClose to force the shutdown */
-            ConnClose(POP3.server.ssl.conn, 1);
+            ConnClose(POP3.server.ssl.conn);
             POP3.server.ssl.conn = NULL;
         }
 
@@ -1829,7 +1829,7 @@ POP3Server(void *ignored)
 
         if (POP3.nmap.ssl.conn) {
             /* fixme - we need connection management flags for ConnClose to force the shutdown */
-            ConnClose(POP3.nmap.ssl.conn, 1);
+            ConnClose(POP3.nmap.ssl.conn);
             POP3.nmap.ssl.conn = NULL;
         }
 
@@ -1929,7 +1929,7 @@ client->CSSL = NULL;
             }
 
             /* fixme - we need connection management flags for ConnClose to force the shutdown */
-            ConnClose(conn, 1);
+            ConnClose(conn);
 
             ConnFree(conn);
             conn = NULL;
@@ -1968,14 +1968,14 @@ client->CSSL = NULL;
 
     if (POP3.server.conn) {
         /* fixme - we need connection management flags for ConnClose to force the shutdown */
-        ConnClose(POP3.server.conn, 1);
+        ConnClose(POP3.server.conn);
         POP3.server.conn = NULL;
     }
 
     POP3.server.ssl.enable = FALSE;
 
     if (POP3.server.ssl.conn) {
-        ConnClose(POP3.server.ssl.conn, 1);
+        ConnClose(POP3.server.ssl.conn);
         POP3.server.ssl.conn = NULL;
     }
 
@@ -2088,7 +2088,7 @@ XplServiceMain(int argc, char *argv[])
         return(-1);
     }
 
-    ConnStartup(CONNECTION_TIMEOUT, TRUE);
+    ConnStartup(CONNECTION_TIMEOUT);
 
     MsgInit();
     MsgAuthInit();
diff --git a/src/agents/queue/queue.c b/src/agents/queue/queue.c
index dd15f05..9df8ddb 100644
--- a/src/agents/queue/queue.c
+++ b/src/agents/queue/queue.c
@@ -423,7 +423,7 @@ GetNMAPConnection(NMAPConnections *list,
     result = NMAPAuthenticateToStore(conn, line, CONN_BUFSIZE);
     if (!result) {
         NMAPQuit(conn);
-        ConnClose(conn, 0);
+        ConnClose(conn);
         ConnFree(conn);
         return DELIVER_TRY_LATER;
     }
@@ -434,7 +434,7 @@ GetNMAPConnection(NMAPConnections *list,
             list->connections = (NMAPConnection *)temp;
         } else {
             NMAPQuit(conn);
-            ConnClose(conn, 0);
+            ConnClose(conn);
             ConnFree(conn);
             return DELIVER_TRY_LATER;
         }
@@ -529,7 +529,7 @@ EndStoreDelivery(NMAPConnections *list)
                 NMAPReadAnswer(nmap->conn, line, CONN_BUFSIZE, FALSE);
             }
 
-            ConnClose(nmap->conn, 0);
+            ConnClose(nmap->conn);
             ConnFree(nmap->conn);
         } 
     }
@@ -1509,7 +1509,7 @@ StartOver:
             }
 
             if (client->conn) {
-                ConnClose(client->conn, 0);
+                ConnClose(client->conn);
                 ConnFree(client->conn);
                 client->conn = NULL;
             }
diff --git a/src/agents/queue/queued.c b/src/agents/queue/queued.c
index 4c6c34f..1457174 100644
--- a/src/agents/queue/queued.c
+++ b/src/agents/queue/queued.c
@@ -522,7 +522,7 @@ QueueServer(void *ignored)
 
     /* Shutting down */
     if (Agent.clientListener) {
-        ConnClose(Agent.clientListener, 1);
+        ConnClose(Agent.clientListener);
         Agent.clientListener = NULL;
     }
 
diff --git a/src/agents/rules/rules.c b/src/agents/rules/rules.c
index 41e8f85..f03199e 100644
--- a/src/agents/rules/rules.c
+++ b/src/agents/rules/rules.c
@@ -1191,7 +1191,7 @@ RulesAgentServer(void *ignored)
                                        ProcessEntry,
                                        &RulesAgent.OutgoingPool);
     BongoThreadPoolShutdown(RulesAgent.OutgoingThreadPool);
-    ConnClose(RulesAgent.nmapOutgoing, 1);
+    ConnClose(RulesAgent.nmapOutgoing);
     RulesAgent.nmapOutgoing = NULL;
 
     /* Shutting down */
diff --git a/src/agents/smtp/smtpc.c b/src/agents/smtp/smtpc.c
index e343b1c..ed44437 100755
--- a/src/agents/smtp/smtpc.c
+++ b/src/agents/smtp/smtpc.c
@@ -617,7 +617,7 @@ ProcessEntry(void *clientp, Connection *conn)
         DeliverMessage(Queue, &Remote, &CurrentRecip);
         
         // we're responsible for closing this connection
-        ConnClose(Remote.conn, 1);
+        ConnClose(Remote.conn);
         ConnFree(Remote.conn);
         Remote.conn = NULL;
 
@@ -681,7 +681,7 @@ SMTPAgentServer(void *ignored)
                                        ProcessEntry,
                                        &SMTPAgent.OutgoingPool);
     BongoThreadPoolShutdown(SMTPAgent.OutgoingThreadPool);
-    ConnClose(SMTPAgent.nmapOutgoing, 1);
+    ConnClose(SMTPAgent.nmapOutgoing);
     SMTPAgent.nmapOutgoing = NULL;
 
     /* Shutting down */
diff --git a/src/agents/smtp/smtpd.c b/src/agents/smtp/smtpd.c
index 51ac789..7a3ff92 100644
--- a/src/agents/smtp/smtpd.c
+++ b/src/agents/smtp/smtpd.c
@@ -267,7 +267,7 @@ strchrRN (unsigned char *Buffer, unsigned char SrchChar,
 
 #define FreeInternalConnection(c)           \
     if (c.conn) {                           \
-        ConnClose(c.conn, 1);               \
+        ConnClose(c.conn);               \
         ConnFree(c.conn);                   \
         c.conn = NULL;                      \
                                             \
@@ -2141,7 +2141,7 @@ DeliverRemoteMessage (ConnectionStruct * Client, unsigned char *Sender,
             RetVal = DeliverSMTPMessage(Client, Sender, Recips, RecipCount,
                                         MsgFlags, Result, ResultLen);
         }
-        ConnClose(conn, 1);
+        ConnClose(conn);
         ConnFree(conn);
         if (RetVal != DELIVER_SUCCESS) {
             DELIVER_ERROR(DELIVER_TRY_LATER);
@@ -3561,11 +3561,11 @@ QueueServerStartup (void *ignored)
                     ReturnSMTPConnection(client);
                 }
                 /* GetSMTPConnection failed */
-                ConnClose(conn, 1);
+                ConnClose(conn);
                 ConnFree(conn);
                 continue;
             }
-            ConnClose(conn, 1);
+            ConnClose(conn);
             ConnFree(conn);
         }
     }
@@ -3586,7 +3586,7 @@ SMTPShutdownSigHandler (int sigtype)
         signaled = Exiting = TRUE;
 
         if (SMTPServerConnection) {
-            ConnClose(SMTPServerConnection, 1);
+            ConnClose(SMTPServerConnection);
             ConnFree(SMTPServerConnection);
             SMTPServerConnection = NULL;
         }
@@ -3701,23 +3701,23 @@ SMTPServer (void *ignored)
                         /* GetSMTPConnection failed */
 
                         ConnSend(conn, MSG500NOMEMORY, MSG500NOMEMORY_LEN);
-                        ConnClose(conn, 1);
+                        ConnClose(conn);
                         ConnFree(conn);
                         continue;
                     } else {
                         /* No more threads available */
                         ConnSend(conn, MSG451NOCONNECTIONS, MSG451NOCONNECTIONS_LEN);
-                        ConnClose(conn, 1);
+                        ConnClose(conn);
                         ConnFree(conn);
                     }
                 } else {
                     /* RecieverStopped */
                     ConnSend(conn, MSG451RECEIVERDOWN, MSG451RECEIVERDOWN_LEN);
-                    ConnClose(conn, 1);
+                    ConnClose(conn);
                     ConnFree(conn);
                 }
             }
-            ConnClose(conn, 1);
+            ConnClose(conn);
             ConnFree(conn);
             continue;
         }
@@ -3762,24 +3762,24 @@ SMTPServer (void *ignored)
     Log(LOG_DEBUG, "Closing server socket");
 
     if (SMTPServerConnection) {
-        ConnClose(SMTPServerConnection, 1);
+        ConnClose(SMTPServerConnection);
         ConnFree(SMTPServerConnection);
         SMTPServerConnection = NULL;
     }
     if (SMTPServerConnectionSSL) {
-        ConnClose(SMTPServerConnectionSSL, 1);
+        ConnClose(SMTPServerConnectionSSL);
         ConnFree(SMTPServerConnectionSSL);
         SMTPServerConnectionSSL = NULL;
     }
 
     if (SMTPQServerConnection) {
-        ConnClose(SMTPQServerConnection, 1);
+        ConnClose(SMTPQServerConnection);
         ConnFree(SMTPQServerConnection);
         SMTPQServerConnection = NULL;
     }
 
     if (SMTPQServerConnectionSSL) {
-        ConnClose(SMTPQServerConnectionSSL, 1);
+        ConnClose(SMTPQServerConnectionSSL);
         ConnFree(SMTPQServerConnectionSSL);
         SMTPQServerConnectionSSL = NULL;
     }
@@ -3864,7 +3864,7 @@ SMTPSSLServer (void *ignored)
                                 continue;
                             }
                             ReturnSMTPConnection(client);
-                            ConnClose(conn, 1);
+                            ConnClose(conn);
                             ConnFree(conn);
                             continue;
                         } else {
@@ -3887,13 +3887,13 @@ SMTPSSLServer (void *ignored)
                     if (ConnWrite(conn, message, arg) != -1) {
                         ConnFlush(conn);
                     }
-                    ConnClose(conn, 1);
+                    ConnClose(conn);
                     ConnFree(conn);
                     continue;
                 }
 
                 ConnSend(conn, message, arg);
-                ConnClose(conn, 1);
+                ConnClose(conn);
                 ConnFree(conn);
                 continue;
             }
@@ -4022,7 +4022,7 @@ int XplServiceMain (int argc, char *argv[])
 
     // FIXME: Connio socket timeout needs to be a run-time tunable. bug #9924
     // ConnStartup (SMTP.socket_timeout, TRUE);
-    ConnStartup(600, TRUE);
+    ConnStartup(600);
 
     NMAPInitialize();
 
diff --git a/src/agents/store/stored.c b/src/agents/store/stored.c
index 38269db..c6389f7 100644
--- a/src/agents/store/stored.c
+++ b/src/agents/store/stored.c
@@ -163,7 +163,7 @@ StoreServer()
     Log(LOG_INFO, "Shutting down.");
 
     if (StoreAgent.nmapConn) {
-        ConnClose(StoreAgent.nmapConn, 1);
+        ConnClose(StoreAgent.nmapConn);
         StoreAgent.nmapConn = NULL;
     }
 
diff --git a/src/apps/manager/manager.c b/src/apps/manager/manager.c
index 055d7ab..78676a4 100644
--- a/src/apps/manager/manager.c
+++ b/src/apps/manager/manager.c
@@ -862,7 +862,7 @@ get_lock:
         fprintf(stderr, _("bongo-manager: failed to initialize memory manager.  Exiting\n"));
         goto err_handler;
     }
-    ConnStartup(DEFAULT_CONNECTION_TIMEOUT, TRUE);
+    ConnStartup(DEFAULT_CONNECTION_TIMEOUT);
 
     // set startLdap here if we want to start a managed slapd instance
     // startLdap = atoi(buf);
diff --git a/src/libs/connio/CMakeLists.txt b/src/libs/connio/CMakeLists.txt
index 7649d81..93b1995 100644
--- a/src/libs/connio/CMakeLists.txt
+++ b/src/libs/connio/CMakeLists.txt
@@ -1,3 +1,4 @@
+#StrictCompile()
 
 add_library(bongoconnio SHARED
 	connio.c
diff --git a/src/libs/connio/connio.c b/src/libs/connio/connio.c
index 1f929b1..866af42 100644
--- a/src/libs/connio/connio.c
+++ b/src/libs/connio/connio.c
@@ -99,14 +99,12 @@ __gnutls_new(Connection *conn, bongo_ssl_context *context, gnutls_connection_end
 }
 
 BOOL 
-ConnStartup(unsigned long TimeOut, BOOL EnableSSL)
+ConnStartup(unsigned long TimeOut)
 {
     /**
      * Start up the connio library - must be initialised before use
      */
     int i;
-    unsigned char c;
-    unsigned char seed[129];
     FILE *genparams;
 
     /* initialize the gnutls library */
@@ -164,23 +162,10 @@ ConnStartup(unsigned long TimeOut, BOOL EnableSSL)
     ConnIO.allocated.head = NULL;
     ConnIO.encryption.enabled = FALSE;
     ConnIO.trace.enabled = FALSE;
+    ConnIO.encryption.enabled = TRUE;
 
     IPInit();
 
-    if (EnableSSL && (ConnIO.encryption.enabled == FALSE)) {
-        ConnIO.encryption.enabled = TRUE;
-
-        srand((unsigned int)time(NULL));
-
-        memset(seed, 0, sizeof(seed));
-        for (i = 0; i < 64; i++) {
-            c = ' ' + ((unsigned char)rand() % 0x60) ;
-            sprintf(seed + (i * 2), "%02x", c);
-        }
-
-        seed[sizeof(seed) - 1] = '\0';
-    }
-
     XplSignalLocalSemaphore(ConnIO.allocated.sem);
 
     return(TRUE);
@@ -480,7 +465,7 @@ ConnNegotiate(Connection *conn, bongo_ssl_context *context)
 }
 
 int 
-ConnClose(Connection *Conn, unsigned long Flags)
+ConnClose(Connection *Conn)
 {
     register Connection *c = Conn;
 
@@ -493,7 +478,7 @@ ConnClose(Connection *Conn, unsigned long Flags)
 }
 
 void 
-ConnCloseAll(unsigned long Flags)
+ConnCloseAll()
 {
     register Connection *c;
 
diff --git a/src/libs/json/bongojsonrpc.c b/src/libs/json/bongojsonrpc.c
index afe73ee..f7aba2f 100644
--- a/src/libs/json/bongojsonrpc.c
+++ b/src/libs/json/bongojsonrpc.c
@@ -53,7 +53,7 @@ BongoJsonRpcFree (BongoJsonRpc *rpc)
     
     BongoJsonParserFree (rpc->parser);
     
-    ConnClose (rpc->conn, 0);
+    ConnClose (rpc->conn);
     ConnFree (rpc->conn);
     
     MemFree (rpc);
diff --git a/src/libs/msgapi/msgcollector.c b/src/libs/msgapi/msgcollector.c
index f5abbd1..ccee9e3 100644
--- a/src/libs/msgapi/msgcollector.c
+++ b/src/libs/msgapi/msgcollector.c
@@ -140,21 +140,21 @@ ConnectToStore(const char *user)
     
     if (!NMAPAuthenticateToStore(conn, buffer, sizeof(buffer))) {
         printf("bongocollector: couldn't authenticate\n");
-        ConnClose(conn, TRUE);
+        ConnClose(conn);
         return NULL;
     }
     
     ret = NMAPRunCommandF(conn, buffer, sizeof(buffer), "USER %s\r\n", user);
     if (ret != 1000) {
         printf("bongocollector: couldn't select user '%s'\n", user);
-        ConnClose(conn, TRUE);
+        ConnClose(conn);
         return NULL;
     }
 
     ret = NMAPRunCommandF(conn, buffer, sizeof(buffer), "STORE %s\r\n", user);
     if (ret != 1000) {
         printf("bongocollector: couldn't change store '%s'\n", user);
-        ConnClose(conn, TRUE);
+        ConnClose(conn);
         return NULL;
     }
 
@@ -406,7 +406,7 @@ ImportJson(GArray *objects,
 done:
 
     if (!existingConn) {
-        ConnClose(conn, TRUE);
+        ConnClose(conn);
         ConnFree(conn);
     }
     
@@ -645,7 +645,7 @@ MsgCollectUser(const char *user)
         cur = cur->next;
     }
 
-    ConnClose(conn, TRUE);
+    ConnClose(conn);
     ConnFree(conn);
 
     BongoSubscribedCalListFree(cals);
@@ -774,7 +774,7 @@ MsgIcsSubscribe(const char *user, const char *name, const char *color, const cha
     cal = SubscribedCalNew(0, name, color, url, urlUsername, urlPassword, 0);
     ret = MsgImportSubscribedCal(user, cal, conn, guidOut);
 
-    ConnClose(conn, TRUE);
+    ConnClose(conn);
     ConnFree(conn);
 
     SubscribedCalFree(cal);
@@ -796,7 +796,7 @@ MsgIcsImport(const char *user, const char *name, const char *color, const char *
     cal = SubscribedCalNew(0, name, color, url, urlUsername, urlPassword, 0);
     ret = MsgImportCal(user, cal, conn, guidOut);
 
-    ConnClose(conn, TRUE);
+    ConnClose(conn);
     ConnFree(conn);
 
     SubscribedCalFree(cal);
diff --git a/src/libs/nmap/bongoagent.c b/src/libs/nmap/bongoagent.c
index 0cf4528..ae94df9 100644
--- a/src/libs/nmap/bongoagent.c
+++ b/src/libs/nmap/bongoagent.c
@@ -306,7 +306,7 @@ BongoAgentInit(BongoAgent *agent,
     }
 
     if (startupResources & BA_STARTUP_CONNIO) {
-        ConnStartup(timeOut, TRUE);
+        ConnStartup(timeOut);
     }
 
     if (startupResources & BA_STARTUP_MSGLIB) {
@@ -370,7 +370,7 @@ QueueHandleConnection (void *datap)
     NMAPSendCommand(data->conn, "QDONE\r\n", 7);
     NMAPReadAnswer(data->conn, line, CONN_BUFSIZE, FALSE);
 
-    ConnClose(data->conn, 1);
+    ConnClose(data->conn);
     ConnFree(data->conn);
     
     data->clientFree(client);
@@ -397,7 +397,7 @@ HandleConnection (void *datap)
         ccode = data->handler(client, data->conn);
     }
 
-    ConnClose(data->conn, 1);
+    ConnClose(data->conn);
     ConnFree(data->conn);
     
     data->clientFree(client);
@@ -444,7 +444,7 @@ ListenInternal(BongoAgent *agent,
                 if (queueSocket) {
                     ConnWrite(conn, "QDONE\r\n", 7);
                 }
-                ConnClose(conn, 0);
+                ConnClose(conn);
                 ConnFree(conn);
                 conn = NULL;
             }
diff --git a/src/libs/nmap/nmap.c b/src/libs/nmap/nmap.c
index acb2e87..10b5bc5 100644
--- a/src/libs/nmap/nmap.c
+++ b/src/libs/nmap/nmap.c
@@ -1589,7 +1589,7 @@ NMAPQuit(Connection *conn)
 {
     ConnWrite(conn, "QUIT\r\n", 6);
 
-    ConnClose(conn, 0);
+    ConnClose(conn);
 
     return;
 }
diff --git a/src/libs/python/libbongo/libs.c b/src/libs/python/libbongo/libs.c
index db783d8..37d37fe 100644
--- a/src/libs/python/libbongo/libs.c
+++ b/src/libs/python/libbongo/libs.c
@@ -62,7 +62,7 @@ initlibs()
         return;
     }
 
-    if (!ConnStartup(DEFAULT_CONNECTION_TIMEOUT, TRUE)) {
+    if (!ConnStartup(DEFAULT_CONNECTION_TIMEOUT)) {
         PyErr_SetString(PyExc_ImportError,
                         "bongo.libs error: ConnStartup() failed");
         return;