diff --git a/maestro/pool_manager_registry.c b/maestro/pool_manager_registry.c
index 6f1eb45f87ef7a30ec3fd5ec9c4673c4857dea8a..07f40ccb3e1259dc12a9186f1bf0d192a8907a51 100644
--- a/maestro/pool_manager_registry.c
+++ b/maestro/pool_manager_registry.c
@@ -1496,6 +1496,8 @@ mstro_pm__cdo_handle_entry__create(uint64_t local_id, mstro_cdo_state state,
   tmp->local_id = local_id;
   tmp->cdo_state = state;
   tmp->attributes = NULL;
+  tmp->n_segments = 0;
+  tmp->dist_layout = NULL;
   *result = tmp;
   return MSTRO_OK;
 }
@@ -1504,7 +1506,7 @@ static inline
 mstro_status
 mstro_pm__cdo_handle_entry__destroy(struct cdo_handle_entry *h)
 {
-  mstro_status m_status = MSTRO_UNIMPL;
+  mstro_status m_status = MSTRO_OK;
   mmbError stat = MMB_OK;
   if(h==NULL)
     return MSTRO_INVARG;