diff --git a/macros.cmake b/macros.cmake
index 0bac0be23..3dd3dc03b 100644
--- a/macros.cmake
+++ b/macros.cmake
@@ -9,7 +9,7 @@ macro(set_maxscale_version)
   #MaxScale version number
   set(MAXSCALE_VERSION_MAJOR "1")
   set(MAXSCALE_VERSION_MINOR "0")
-  set(MAXSCALE_VERSION_PATCH "5") 
+  set(MAXSCALE_VERSION_PATCH "6") 
   set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")
   set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}-unstable")
 
diff --git a/server/core/hashtable.c b/server/core/hashtable.c
index 1b2897d75..86d1d821e 100644
--- a/server/core/hashtable.c
+++ b/server/core/hashtable.c
@@ -232,7 +232,7 @@ hashtable_memory_fns(
 int
 hashtable_add(HASHTABLE *table, void *key, void *value)
 {
-        int		hashkey;
+        unsigned int		hashkey;
         HASHENTRIES	*entry;
 
         if (key == NULL || value == NULL)
@@ -308,7 +308,7 @@ hashtable_add(HASHTABLE *table, void *key, void *value)
 int
 hashtable_delete(HASHTABLE *table, void *key)
 {
-int		hashkey = table->hashfn(key) % table->hashsize;
+unsigned int		hashkey = table->hashfn(key) % table->hashsize;
 HASHENTRIES	*entry, *ptr;
 
 	hashtable_write_lock(table);
@@ -369,7 +369,7 @@ HASHENTRIES	*entry, *ptr;
 void *
 hashtable_fetch(HASHTABLE *table, void *key)
 {
-int		hashkey = table->hashfn(key) % table->hashsize;
+unsigned int		hashkey = table->hashfn(key) % table->hashsize;
 HASHENTRIES	*entry;
 
 	hashtable_read_lock(table);
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index 14ca611e8..f78bb4537 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/server/modules/protocol/mysql_client.c
@@ -569,7 +569,7 @@ int gw_read_client_event(
         int             rc = 0;
         int             nbytes_read = 0;
         uint8_t         cap = 0;
-        bool            stmt_input; /*< router input type */
+        bool            stmt_input = false; /*< router input type */
 
         CHK_DCB(dcb);
         protocol = DCB_PROTOCOL(dcb, MySQLProtocol);