diff --git a/maestro/logging.c b/maestro/logging.c
index ad00a0a5f7905f9098dfa4713e92505776cb0167..50bae0925979f6caff1f55a5ce019bd780d2d537 100644
--- a/maestro/logging.c
+++ b/maestro/logging.c
@@ -476,6 +476,7 @@ mstro_vlocation_aware_log(int level,
 		          const char *func, const char* file, int line,
                           const char *fmtstring, va_list ap)
 {
+  char header[1024] = "";
   if(g_queried_env==false)
     mstro_log__init();
     
@@ -496,10 +497,6 @@ mstro_vlocation_aware_log(int level,
       }
       pthread_mutex_unlock(&g_initdata_mtx);
     }
-    
-    /* FIXME: add more locality info, map of pthread_t ID to
-     * messaging/transport/other thread letter? */
-    char header[1024] = "";
 
     enum ansi_color_symbol color = g_log_color;
     if(g_color_errors) {
diff --git a/maestro/pool.c b/maestro/pool.c
index d1fbeb57ffaf4cab584166d3bbf3eb43dae1f6d2..d700b1a5cf11eab7632c845da89790a2a2e0fbae 100644
--- a/maestro/pool.c
+++ b/maestro/pool.c
@@ -1038,7 +1038,8 @@ mstro_pool_finalize(void)
     goto BAILOUT;
   }
   num_entries = HASH_COUNT(g_mstro_pool_local);
-  INFO("Pool has %zu entries\n", num_entries);
+  DEBUG("Pool has %zu entries\n", num_entries);
+
   if(g_have_pool_manager) {
     /* FIXME: this needs to go away when the ofi.c refactoring is done */
     mstro_status mstro_pc_terminate(void);
@@ -1048,9 +1049,9 @@ mstro_pool_finalize(void)
       ERR("Failed to tear down pool manager connection\n");
     }
   }
+  /* hopefully reduced to 0 by now */
+  num_entries = HASH_COUNT(g_mstro_pool_local);
   if(num_entries>0) {
-    WARN("NOT signaling pool manager to syphon off %d pool entries\n",
-         num_entries);
     struct mstro_pool_entry *e,*tmp;
     HASH_ITER(hh, g_mstro_pool_local, e, tmp) {
       HASH_DEL(g_mstro_pool_local, e);
@@ -1067,6 +1068,10 @@ mstro_pool_finalize(void)
         nonempty_entry_errors=true;
       }
 
+
+      if(nonempty_entry_errors) {
+      	ERR("Pool had live CDOs at termination\n");
+      }
       status = mstro_pool_entry__destroy(e);
     }
   }
diff --git a/maestro/pool_client.c b/maestro/pool_client.c
index e25fc395f130b6c1493b58ae72f0b1acdd8cf89b..f8408d2e9b52881b3a0439df51068cb9161aa13b 100644
--- a/maestro/pool_client.c
+++ b/maestro/pool_client.c
@@ -750,7 +750,7 @@ mstro_pc__handle_transfer_completed(Mstro__Pool__MstroMsg *msg)
 
     mstro_cdo__find_cdo(&cdoid, &cdo);
     if(cdo==NULL) {
-      WITH_CDO_ID_STR(idstr, &cdo, {
+      WITH_CDO_ID_STR(idstr, &cdoid, {
           ERR("Cannot find CDO %s for which completion was signalled\n", idstr);
         });
       goto DONE;
@@ -770,7 +770,7 @@ mstro_pc__handle_transfer_completed(Mstro__Pool__MstroMsg *msg)
       DEBUG("Source CDO empty, doing NULL transfer\n");
       s=MSTRO_OK;
     } else {
-      WITH_CDO_ID_STR(idstr, &cdo, {
+      WITH_CDO_ID_STR(idstr, &cdoid, {
           ERR("Nonempty CDO had no memory registration to clean up\n");
         });
     }