diff --git a/maestro/pool_client.c b/maestro/pool_client.c
index 5a939776f514df71be1db2cf242a3bf669576695..96caacd15f5b993a32d28155f79e239b381fcd0c 100644
--- a/maestro/pool_client.c
+++ b/maestro/pool_client.c
@@ -882,7 +882,6 @@ mstro_pc__handle_transfer_ticket(Mstro__Pool__TransferTicket* ticket)
     */
     int64_t expected = 0;
     atomic_compare_exchange_strong(&dst_cdo->n_segments, &expected, ticket->n_segments);
-    DEBUG("Already recieved %"PRId64" of %"PRId64" segements \n", expected, ticket->n_segments);
     /* Execute transport (non-blocking) */
     status = mstro_transport_execute(dst_cdo, ticket);
     if(MSTRO_OK != status) {
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c2398f81f00470dab50a35d6fbbb6735b8afd11e..f11467955c42664556d25c8b022bd0357d393103 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -131,8 +131,6 @@ check_PROGRAMS = check_version check_init check_uuid \
 		 simple_interlock_async_client_2 \
 		 simple_dist_client_1 \
 		 simple_dist_client_2 \
-		 simple_dist_client_3 \
-		 simple_dist_client_4 \
 		 simple_injector \
 		 simple_archiver \
 		 simple_telemetry_listener \
@@ -259,10 +257,6 @@ simple_dist_client_1_SOURCES = simple_dist_client.c
 simple_dist_client_1_CPPFLAGS = $(AM_CPPFLAGS)  -DCOMPONENT_ID=1
 simple_dist_client_2_SOURCES = simple_dist_client.c
 simple_dist_client_2_CPPFLAGS = $(AM_CPPFLAGS)  -DCOMPONENT_ID=2
-simple_dist_client_3_SOURCES = simple_dist_client.c
-simple_dist_client_3_CPPFLAGS = $(AM_CPPFLAGS)  -DCOMPONENT_ID=3
-simple_dist_client_4_SOURCES = simple_dist_client.c
-simple_dist_client_4_CPPFLAGS = $(AM_CPPFLAGS)  -DCOMPONENT_ID=4
 simple_injector_SOURCES = simple_interlock_client.c
 simple_injector_CPPFLAGS = $(AM_CPPFLAGS) -DCOMPONENT_ID=0 -DCLIENT_ARGS=$(INJECTOR_OPS)
 simple_group_injector_SOURCES = simple_group_client.c
diff --git a/tests/check_pm_dist_cdo.sh.in b/tests/check_pm_dist_cdo.sh.in
index 0a7b835fdd5efa1d0ca9ea04ac1e693b538bdf2c..6989f9c16e017a1ff957f6625f42679e5654d6ef 100644
--- a/tests/check_pm_dist_cdo.sh.in
+++ b/tests/check_pm_dist_cdo.sh.in
@@ -95,16 +95,9 @@ export MSTRO_POOL_MANAGER_INFO
 # start client 2
 (env MSTRO_TRANSPORT_DEFAULT=OFI MSTRO_LOG_LEVEL=3 MSTRO_COMPONENT_NAME="consumer"  MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="GREEN" ${CLIENT_CMD}_2 -n) || exit 99  &
 
-#start client 3
-#(env MSTRO_TRANSPORT_DEFAULT=GFS MSTRO_LOG_LEVEL=3 MSTRO_COMPONENT_NAME="producer2"  MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="GREEN" ${CLIENT_CMD}_3 -n) || exit 99  &
-
-# start client 4
-#(env MSTRO_TRANSPORT_DEFAULT=GFS MSTRO_LOG_LEVEL=3 MSTRO_COMPONENT_NAME="consumer"  MSTRO_LOG_COLOR_ERRORS=1 MSTRO_LOG_COLOR="GREEN" ${CLIENT_CMD}_4 -n) || exit 99  &
-
 wait %1 || exit 99
 wait %2 || exit 99
-#wait %3 || exit 99
-#wait %4 || exit 99
+
 
 # trap normal script termination: close pipe to pool manager
 terminate ${PM_PID} 0
diff --git a/transport/rdma.c b/transport/rdma.c
index 104814198808dd16b9324445fcc7ec71ff65f004..8afb5cafa72be0908a9e9250a36803dfc6a3207a 100644
--- a/transport/rdma.c
+++ b/transport/rdma.c
@@ -222,8 +222,9 @@ FRESH_REGISTRATION:
       ERR("Couldn't get CDO data and size for RDMA transport (status: %s)\n", mstro_status_description(status));
       goto BAILOUT_UNLOCK;
     }
-    regentry->addr=dl.data+ticket->src_offset;
-    DEBUG("Moving cdo ptr by %zu as src offset \n\n\n\n\n", ticket->src_offset);
+    /*Calculate the src ptr taking into account source offsets for dist_cdos */
+    regentry->addr=(void *) ((char *) dl.data+ticket->src_offset);
+    DEBUG("Moving cdo ptr by %zu as src offset \n", ticket->src_offset);
     regentry->len=dl.len;
 
     if (mstro_memlock(dl.data, dl.len) != MSTRO_OK) {
@@ -234,10 +235,8 @@ FRESH_REGISTRATION:
 
     /*  register this address for OFI */
     struct fid_mr *mr;
-    /*Calculate the src ptr taking into account source offsets for dist_cdos -- silence compiler warnings */
-    void * src_ptr = regentry->addr; //(void *) ((char *) dl.data);
     uint64_t requested_key = e->ep->fi->domain_attr->mr_mode & FI_MR_PROV_KEY ? 0 : mstro_memory_new_key();
-    int err = fi_mr_reg(e->ep->domain, src_ptr, dl.len,
+    int err = fi_mr_reg(e->ep->domain, regentry->addr, dl.len,
                         FI_REMOTE_READ, 0, requested_key, 0, &mr, NULL);
     if(err) {
       ERR("Couldn't register memory region for RDMA transport (err: %d)\n", err);
@@ -429,8 +428,11 @@ mstro_transport_rdma_dst_execute(mstro_cdo cdo_dst, Mstro__Pool__TransferTicket*
   }
 */
 
+  /*write data with correct offset at dst for dist_cdos --silence compiler warnings*/
+  void * dst_ptr = (void *) ((char *) cdo_dst->raw_ptr+ticket->dst_offset); 
+
   uint64_t requested_key = app_entry->ep->fi->domain_attr->mr_mode & FI_MR_PROV_KEY ? 0 : mstro_memory_new_key();
-  int err = fi_mr_reg(app_entry->ep->domain, cdo_dst->raw_ptr+ticket->dst_offset, len,
+  int err = fi_mr_reg(app_entry->ep->domain, dst_ptr, len,
                   FI_READ, 0, requested_key, 0, &mr, NULL);
   if (err) {
 	ERR("Couldn't register memory region for RDMA transport (err: %d, %s)\n", 
@@ -514,9 +516,8 @@ mstro_transport_rdma_dst_execute(mstro_cdo cdo_dst, Mstro__Pool__TransferTicket*
     goto BAILOUT;
   }
 
-  /*write data with correct offset at dst for dist_cdos --silence compiler warnings*/
+
   int num_retries = 3;
-  void * dst_ptr = (void *) ((char *) cdo_dst->raw_ptr+ticket->dst_offset); 
   
  RETRY_RDMA_TRANSPORT_READ: ;
   ret = fi_read(app_entry->ep->ep, dst_ptr, len, local_buf_mr_desc,