diff --git a/server/core/gateway.c b/server/core/gateway.c
index 7cabfeb16..8f9c7df4e 100644
--- a/server/core/gateway.c
+++ b/server/core/gateway.c
@@ -470,6 +470,8 @@ ssize_t         log_flush_timeout_ms = 0;
 	for (n = 0; n < n_threads - 1; n++)
 		thread_wait(threads[n]);
 
+        free(threads);
+        
         /**
          * Wait the flush thread.
          */
diff --git a/server/core/users.c b/server/core/users.c
index cc7646dc4..23dfc1ef2 100644
--- a/server/core/users.c
+++ b/server/core/users.c
@@ -189,5 +189,6 @@ char		*sep, *user;
 			sep = ", ";
 		}
 		dcb_printf(dcb, "\n");
+                hashtable_iterator_free(iter);
 	}
 }
diff --git a/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c
index 3ac9748fa..672991a53 100644
--- a/server/modules/protocol/telnetd.c
+++ b/server/modules/protocol/telnetd.c
@@ -265,7 +265,7 @@ int	n_connect = 0;
 	{
 		int			so;
 		struct sockaddr_in	addr;
-		socklen_t		addrlen;
+		socklen_t		addrlen = sizeof(struct sockaddr);
 		DCB			*client;
 
 		if ((so = accept(dcb->fd, (struct sockaddr *)&addr, &addrlen)) == -1)