diff --git a/server/core/buffer.c b/server/core/buffer.c
index 45ddfd1cc..dceb171ce 100644
--- a/server/core/buffer.c
+++ b/server/core/buffer.c
@@ -81,6 +81,7 @@ SHARED_BUF	*sbuf;
 	if ((sbuf = (SHARED_BUF *)malloc(sizeof(SHARED_BUF))) == NULL)
 	{
 		free(rval);
+		rval = NULL;
 		goto retblock;
 	}
 
@@ -90,6 +91,7 @@ SHARED_BUF	*sbuf;
 		ss_dassert(sbuf->data != NULL);
 		free(rval);
 		free(sbuf);
+		rval = NULL;
 		goto retblock;
 	}
 	spinlock_init(&rval->gwbuf_lock);
@@ -106,9 +108,8 @@ SHARED_BUF	*sbuf;
         rval->gwbuf_bufobj = NULL;
         CHK_GWBUF(rval);
 retblock:
-	if (rval == NULL || sbuf == NULL || sbuf->data == NULL)
+	if (rval == NULL)
 	{
-		ss_dassert(rval != NULL && sbuf != NULL && sbuf->data != NULL);
 		LOGIF(LE, (skygw_log_write_flush(
 			LOGFILE_ERROR,
 			"Error : Memory allocation failed due to %s.", 
diff --git a/server/core/secrets.c b/server/core/secrets.c
index 3e57591ed..2e09f661f 100644
--- a/server/core/secrets.c
+++ b/server/core/secrets.c
@@ -254,6 +254,7 @@ MAXKEYS		key;
                         secret_file,
                         errno,
                         strerror(errno))));
+		close(fd);
 		return 1;
 	}
 
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 74472178b..a9640bf2b 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -430,7 +430,7 @@ static int gw_mysql_do_authentication(DCB *dcb, GWBUF *queue) {
 
 	connect_with_db =
                 GW_MYSQL_CAPABILITIES_CONNECT_WITH_DB & gw_mysql_get_byte4(
-                        &protocol->client_capabilities);
+                        (uint32_t *)&protocol->client_capabilities);
         /*
 	compress =
                 GW_MYSQL_CAPABILITIES_COMPRESS & gw_mysql_get_byte4(