diff --git a/server/core/dbusers.c b/server/core/dbusers.c
index 952d329d4..f7bddf0b1 100644
--- a/server/core/dbusers.c
+++ b/server/core/dbusers.c
@@ -404,7 +404,7 @@ USERS	*rval;
 	if ((rval = calloc(1, sizeof(USERS))) == NULL)
 		return NULL;
 
-	if ((rval->data = hashtable_alloc(USERS_HASHTABLE_SIZE, uh_hfun, uh_cmpfun)) == NULL) {
+	if ((rval->data = hashtable_alloc(USERS_HASHTABLE_DEFAULT_SIZE, uh_hfun, uh_cmpfun)) == NULL) {
 		free(rval);
 		return NULL;
 	}
diff --git a/server/modules/protocol/mysql_common.c b/server/modules/protocol/mysql_common.c
index f0b0b4626..e976c6d36 100644
--- a/server/modules/protocol/mysql_common.c
+++ b/server/modules/protocol/mysql_common.c
@@ -1108,7 +1108,6 @@ int gw_find_mysql_user_password_sha1(char *username, uint8_t *gateway_password,
         SERVICE *service = NULL;
 	struct sockaddr_in *client;
         char *user_password = NULL;
-	DCB *dcb = (DCB *)repository;
 	MYSQL_USER_HOST key;
 
 	service = (SERVICE *) dcb->service;