diff --git a/cluster.sh b/cluster.sh
index 74fbb52..cd8be99 100755
--- a/cluster.sh
+++ b/cluster.sh
@@ -138,6 +138,7 @@ do_stop() {
     stop_process "node1"
     stop_process "node2"
     stop_process "node3"
+    rm -f "$SCRIPT_DIR/vsr_boot_marker"
     echo "Cluster stopped."
 }
 
diff --git a/lib/tcp.c b/lib/tcp.c
index 229ff09..51eba33 100644
--- a/lib/tcp.c
+++ b/lib/tcp.c
@@ -282,7 +282,7 @@ int tcp_listen_tcp(TCP *tcp, Address addr)
         return -1;
 
     // TODO: Make these configurable
-    bool reuse_addr = false;
+    bool reuse_addr = true;
     int backlog = 32;
 
     SOCKET fd = create_listen_socket(addr, reuse_addr, backlog);
@@ -302,7 +302,7 @@ int tcp_listen_tls(TCP *tcp, Address addr, string cert_file, string key_file)
         return -1;
 
     // TODO: Make these configurable
-    bool reuse_addr = false;
+    bool reuse_addr = true;
     int backlog = 32;
 
     SOCKET fd = create_listen_socket(addr, reuse_addr, backlog);