diff --git a/src/client.c b/src/client.c
index 2371a2f..bd8f030 100644
--- a/src/client.c
+++ b/src/client.c
@@ -17,7 +17,7 @@
 #include "message.h"
 #include <TinyDFS.h>
 
-#define TAG_METADATA_SERVER -1
+#define TAG_METADATA_SERVER -2
 
 #define TAG_RETRIEVE_METADATA_FOR_READ  1
 #define TAG_RETRIEVE_METADATA_FOR_WRITE 2
diff --git a/src/main_test.c b/src/main_test.c
index 294a0e7..a2d69bb 100644
--- a/src/main_test.c
+++ b/src/main_test.c
@@ -15,7 +15,7 @@ int main(int argc, char **argv)
 
     // TODO: set simulation_should_stop=true on ctrl+C
 
-    startup_simulation(2);
+    startup_simulation(3);
 
     // Spawn metadata server (leader)
     spawn_simulated_process("--addr 127.0.0.1 --port 8080 --leader");
diff --git a/src/metadata_server.h b/src/metadata_server.h
index bc7ff07..9ad57e6 100644
--- a/src/metadata_server.h
+++ b/src/metadata_server.h
@@ -5,8 +5,8 @@
 #include "file_tree.h"
 #include "config.h"
 
-#define CONNECTION_TAG_CLIENT  -1
-#define CONNECTION_TAG_UNKNOWN -2
+#define CONNECTION_TAG_CLIENT  -2
+#define CONNECTION_TAG_UNKNOWN -3
 
 typedef struct {
     int count;