diff --git a/maestro/cdo.c b/maestro/cdo.c
index 3e6a15a890805c3c5a986f4c52bb570d7dd684c2..9f2d0261652e12c32a9d8af83fad951bfa0429e1 100644
--- a/maestro/cdo.c
+++ b/maestro/cdo.c
@@ -512,8 +512,8 @@ mstro_cdo_declaration_seal(mstro_cdo cdo)
       ERR("Failed to create mamba array\n");
       goto BAILOUT;
     }
-    DEBUG("Created mmbArray wrapper at %p, size %"PRIu64"\n",
-          cdo->mamba_array, size);
+    /* DEBUG("Created mmbArray wrapper for raw-ptr %p at %p, size %"PRIu64", inner raw prt %p\n", */
+    /*      cdo->raw_ptr, cdo->mamba_array, size, cdo->mamba_array->allocation->ptr); */
     stat = mmb_layout_destroy(layout);
     if(stat!=MMB_OK) {
       ERR("Failed to deallocate mamba layout: %d (%s)\n",
@@ -1001,6 +1001,9 @@ mstro_cdo__mamba_copy(mstro_cdo src, mstro_cdo dst)
   if(src->mamba_array==NULL || dst->mamba_array==NULL)
     return MSTRO_INVARG;
 
+  /* DEBUG("mamba copy. SRC raw ptr %p, mamba raw ptr %p, DST raw ptr %p, mamba raw ptr %p\n", */
+  /*      src->raw_ptr, src->mamba_array->allocation->ptr, */
+  /*      dst->raw_ptr, dst->mamba_array->allocation->ptr); */
   mmbError stat = mmb_array_copy(
 		  dst->mamba_array, 
 		  src->mamba_array);
diff --git a/maestro/pool.c b/maestro/pool.c
index 2e3648016673a52cddb81c3ebe00eefc55310260..ee90ad81343393763fb55e421fd6cda489809e3f 100644
--- a/maestro/pool.c
+++ b/maestro/pool.c
@@ -162,7 +162,6 @@ mstro_status
 mstro_pool_entry__add(struct mstro_pool_entry *e, mstro_cdo cdo)
 {
   mstro_status status = MSTRO_OK;
-  int s;
   
   if(e==NULL || cdo==NULL)
     return MSTRO_INVARG;
@@ -432,8 +431,7 @@ mstro_pool__remove(mstro_cdo cdo, mstro_cdo_state new_state)
                   );
 
   /* ask pool manager */
-  Mstro__Pool__UUID cdoid;
-  mstro__pool__uuid__init(&cdoid);
+  Mstro__Pool__UUID cdoid = MSTRO__POOL__UUID__INIT;
   cdoid.qw0 = cdo->gid.qw[0];
   cdoid.qw1 = cdo->gid.qw[1];
 
@@ -760,13 +758,11 @@ mstro_pool__demand(mstro_cdo cdo, mstro_cdo_state new_state)
    * notified when the new offer comes in by the same technique as if
    * we're waiting without the pool manager being involved */
   
-  Mstro__Pool__UUID cdoid;
-  mstro__pool__uuid__init(&cdoid);
+  Mstro__Pool__UUID cdoid = MSTRO__POOL__UUID__INIT;
   cdoid.qw0 = cdo->gid.qw[0];
   cdoid.qw1 = cdo->gid.qw[1];
   
-  Mstro__Pool__Demand demand;
-  mstro__pool__demand__init(&demand);
+  Mstro__Pool__Demand demand = MSTRO__POOL__DEMAND__INIT;
   demand.cdoid = &cdoid;
 
   Mstro__Pool__MstroMsg msg = MSTRO__POOL__MSTRO_MSG__INIT;
diff --git a/tests/demo_mvp_d3_2.c b/tests/demo_mvp_d3_2.c
index 012608eefed9433a11a4f15cfa664d7393335a65..064bd4ffbec9c04fd5eb802a1959b5d0209df095 100644
--- a/tests/demo_mvp_d3_2.c
+++ b/tests/demo_mvp_d3_2.c
@@ -541,6 +541,7 @@ archiver_thread_fun(void *closure)
       s |= mstro_cdo_attribute_set(incoming[i],
                                    MSTRO_ATTR_CORE_CDO_SCOPE_LOCAL_SIZE,
                                    &announcement->cdo_size);
+      //      INFO("archiver cdo %d incoming buffer %p\n", i, incoming_buffers[i]);
 
       if(s!=MSTRO_OK) {
         ERR("Failed to add buffer to CDO %s for archiving\n",
@@ -793,6 +794,7 @@ consumer_thread_fun(void *closure)
       s |= mstro_cdo_attribute_set(incoming[i],
                                    MSTRO_ATTR_CORE_CDO_SCOPE_LOCAL_SIZE,
                                    &announcement->cdo_size);
+      //      INFO("consumer cdo %d incoming buffer %p\n", i, incoming_buffers[i]);
 
       if(s!=MSTRO_OK) {
         ERR("Failed to add buffer to CDO %s for consumption\n",