      }
      if (tio_debug) printf("I/O READ All threads finshed\n");
 diff --git a/src/redis-benchmark.c b/src/redis-benchmark.c
-index a221ebdd23a..7a782818469 100644
+index 9d9c15e00..ef35fc84e 100644
 --- a/src/redis-benchmark.c
 +++ b/src/redis-benchmark.c
-@@ -76,11 +76,11 @@ static struct config {
+@@ -70,10 +70,10 @@ static struct config {
      int hostport;
      const char *hostsocket;
      int numclients;

-        pthread_mutex_init(&(config.updating_slots_mutex), NULL);
-        pthread_mutex_init(&(config.slots_last_update_mutex), NULL);
     }

     if (config.keepalive == 0) {
diff --git a/src/replication.c b/src/replication.c
index 3f98b10620b..be05254e8ee 100644
--- a/src/replication.c
+++ b/src/replication.c
@@ -1032,7 +1032,7 @@ void sendBulkToSlave(connection *conn) {
             freeClient(slave);
             return;
         }

  * able to create users, set ACLs to such users, and later authenticate
  * clients using such newly created users. */
diff --git a/src/networking.c b/src/networking.c
index dd2ca1aae..27dfba8af 100644
--- a/src/networking.c
+++ b/src/networking.c
@@ -114,7 +114,8 @@ client *createClient(connection *conn) {
     }
 
     selectDb(c,0);
-    uint64_t client_id = ++server.next_client_id;
+    uint64_t client_id;
