diff --git a/src/bootstrap/bootstrap.cc b/src/bootstrap/bootstrap.cc
index 7c48a78b..d3d432b1 100644
--- a/src/bootstrap/bootstrap.cc
+++ b/src/bootstrap/bootstrap.cc
@@ -170,7 +170,7 @@ out:
   return NULL;
 }
 
-mscclppResult_t bootstrapCreateRoot(struct mscclppBootstrapHandle* handle, bool idFromEnv) {
+mscclppResult_t bootstrapCreateRoot(struct mscclppBootstrapHandle* handle) {
   struct mscclppSocket* listenSock;
   struct bootstrapRootArgs* args;
   pthread_t thread;
@@ -209,10 +209,10 @@ mscclppResult_t bootstrapGetUniqueId(struct mscclppBootstrapHandle* handle, bool
       return mscclppInvalidArgument;
     }
     if (isRoot)
-      MSCCLPPCHECK(bootstrapCreateRoot(handle, false));
+      MSCCLPPCHECK(bootstrapCreateRoot(handle));
   } else {
     memcpy(&handle->addr, &bootstrapNetIfAddr, sizeof(union mscclppSocketAddress));
-    MSCCLPPCHECK(bootstrapCreateRoot(handle, false));
+    MSCCLPPCHECK(bootstrapCreateRoot(handle));
   }
   // printf("addr = %s port = %d\n", inet_ntoa(handle->addr.sin.sin_addr), (int)ntohs(handle->addr.sin.sin_port));
   // printf("addr = %s\n", inet_ntoa((*(struct sockaddr_in*)&handle->addr.sa).sin_addr));
@@ -248,7 +248,7 @@ mscclppResult_t bootstrapInit(struct mscclppBootstrapHandle* handle, struct mscc
   struct mscclppSocket* proxySocket;
   mscclppSocketAddress nextAddr;
   struct mscclppSocket sock, listenSockRoot;
-  struct extInfo info = { 0 };
+  struct extInfo info;
 
   MSCCLPPCHECK(mscclppCalloc(&state, 1));
   state->rank = rank;
diff --git a/src/include/bootstrap.h b/src/include/bootstrap.h
index e7519085..90588e10 100644
--- a/src/include/bootstrap.h
+++ b/src/include/bootstrap.h
@@ -19,7 +19,7 @@ struct mscclppBootstrapHandle {
 static_assert(sizeof(struct mscclppBootstrapHandle) <= sizeof(mscclppUniqueId), "Bootstrap handle is too large to fit inside MSCCLPP unique ID");
 
 mscclppResult_t bootstrapNetInit(const char* ip_port_pair = NULL);
-mscclppResult_t bootstrapCreateRoot(struct mscclppBootstrapHandle* handle, bool idFromEnv);
+mscclppResult_t bootstrapCreateRoot(struct mscclppBootstrapHandle* handle);
 mscclppResult_t bootstrapGetUniqueId(struct mscclppBootstrapHandle* handle, bool isRoot = true, const char* ip_port_pair = NULL);
 mscclppResult_t bootstrapInit(struct mscclppBootstrapHandle* handle, struct mscclppComm* comm);
 mscclppResult_t bootstrapAllGather(void* commState, void* allData, int size);
diff --git a/tests/p2p_test.cu b/tests/p2p_test.cu
index c70b5cd4..9a5591d8 100644
--- a/tests/p2p_test.cu
+++ b/tests/p2p_test.cu
@@ -61,7 +61,9 @@ __global__ void kernel(int rank, int world_size)
   mscclppDevConn_t devConn = constDevConns[remoteRank];
   volatile int *data = (volatile int *)devConn.localBuff;
   volatile uint64_t *localFlag = devConn.localFlag;
+#if (USE_DMA_FOR_P2P == 0)
   volatile uint64_t *remoteFlag = devConn.remoteFlag;
+#endif
   volatile uint64_t *proxyFlag = devConn.proxyFlag;
   unsigned int curFifoHead = atomicInc(devConn.triggerFifoHead, MSCCLPP_PROXY_FIFO_SIZE - 1);
   mscclppTrigger *trig = &devConn.trigger[curFifoHead];