diff --git a/source/adios2/toolkit/sst/cp/cp_common.c b/source/adios2/toolkit/sst/cp/cp_common.c
index 6e092c67d5..83d55c6833 100644
--- a/source/adios2/toolkit/sst/cp/cp_common.c
+++ b/source/adios2/toolkit/sst/cp/cp_common.c
@@ -65,7 +65,7 @@ void CP_validateParams(SstStream Stream, SstParams Params, int Writer)
     if (Params->ControlTransport == NULL)
     {
         /* determine reasonable default, now "sockets" */
-        Params->ControlTransport = strdup("sockets");
+        Params->ControlTransport = strdup("zplenet");
     }
     else
     {
diff --git a/testing/adios2/engine/staging-common/TestCommonServer.cpp b/testing/adios2/engine/staging-common/TestCommonServer.cpp
index 830035ddd0..05c8b09aa8 100644
--- a/testing/adios2/engine/staging-common/TestCommonServer.cpp
+++ b/testing/adios2/engine/staging-common/TestCommonServer.cpp
@@ -165,14 +165,13 @@ TEST_F(CommonServerTest, ADIOS2CommonServer)
             DelayMS)); /* sleep for DelayMS milliseconds */
         step++;
 #ifdef ADIOS2_HAVE_MPI
-        MPI_Allreduce(&MyCloseNow, &GlobalCloseNow, 1, MPI_INT, MPI_LOR,
-                      MPI_COMM_WORLD);
         if (file_exists(shutdown_name))
         {
             MyCloseNow = GlobalCloseNow = 1;
         }
+        MPI_Allreduce(&MyCloseNow, &GlobalCloseNow, 1, MPI_INT, MPI_LOR,
+                      MPI_COMM_WORLD);
 #else
-        GlobalCloseNow = MyCloseNow;
         if (file_exists(shutdown_name))
         {
             MyCloseNow = GlobalCloseNow = 1;
diff --git a/thirdparty/EVPath/EVPath/zpl-enet/include/enet.h b/thirdparty/EVPath/EVPath/zpl-enet/include/enet.h
index bc1df0edbb..db5a1253e5 100644
--- a/thirdparty/EVPath/EVPath/zpl-enet/include/enet.h
+++ b/thirdparty/EVPath/EVPath/zpl-enet/include/enet.h
@@ -2428,6 +2428,7 @@ extern "C" {
                 (peer->outgoingPeerID < ENET_PROTOCOL_MAXIMUM_PEER_ID &&
                 sessionID != peer->incomingSessionID)
             ) {
+                printf("Packet discard because of peer state peerID %d..  COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
                 return 0;
             }
         }
@@ -2435,6 +2436,7 @@ extern "C" {
         if (flags & ENET_PROTOCOL_HEADER_FLAG_COMPRESSED) {
             size_t originalSize;
             if (host->compressor.context == NULL || host->compressor.decompress == NULL) {
+                printf("Packet discard because of bad compression peerID %d..  COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
                 return 0;
             }
 
@@ -2446,6 +2448,7 @@ extern "C" {
             );
 
             if (originalSize <= 0 || originalSize > sizeof(host->packetData[1]) - headerSize) {
+                printf("Packet discard because of original size <=0 peerID %d..  COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
                 return 0;
             }
 
@@ -2465,6 +2468,7 @@ extern "C" {
             buffer.dataLength = host->receivedDataLength;
 
             if (host->checksum(&buffer, 1) != desiredChecksum) {
+                printf("Packet discard because of checksum peerID %d..  COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
                 return 0;
             }
         }
@@ -2618,6 +2622,7 @@ extern "C" {
 
     commandError:
         if (event != NULL && event->type != ENET_EVENT_TYPE_NONE) {
+            printf("Packet discard because of command error peerID %d..  COMMAND DISCARDED, BUT THIS SHOULD NEVER HAPPEN\n", peerID);
             return 1;
         }