diff --git a/maestro/drc.c b/maestro/drc.c
index b573175008fc715a7af0fd3a971ad91ebb37d626..6899332617f7dbf92274acefe465b72047c5d503 100644
--- a/maestro/drc.c
+++ b/maestro/drc.c
@@ -233,7 +233,7 @@ mstro_drc_insert_ofi(struct fi_info *fi, const mstro_drc_info info)
   
 #if FI_VERSION_GE(FI_VERSION(FI_MAJOR_VERSION,FI_MINOR_VERSION), FI_VERSION(1,5))
   // auth key is free()ed by fabric.c on teardown, so we need to duplicate it
-  fi->domain_attr->auth_key = dup_authkey(&info->auth_key);
+  fi->domain_attr->auth_key = (uint8_t*) dup_authkey(&info->auth_key);
   if(fi->domain_attr->auth_key==NULL) {
     return MSTRO_NOMEM;
   }
diff --git a/maestro/pool.c b/maestro/pool.c
index 683d1aba30d4037838988a6e49e6815e8c2218ce..46a05b76064ce055370f8556935c394966f2ad3b 100644
--- a/maestro/pool.c
+++ b/maestro/pool.c
@@ -1135,7 +1135,7 @@ mstro_pool__find_source_cdo(
   }
   if(i<e->num_cdo_handles) {
     DEBUG("Found CDO at index %zu that can provide data\n", i);
-    if(mstro_cdo_state_get(e->cdo_handles[i])==MSTRO_CDO_STATE_SEALED) {
+    if(mstro_cdo_state_get(e->cdo_handles[i])==MSTRO_CDO_STATE_OFFERED_LOCALLY) {
       WITH_CDO_ID_STR(idstr, cdoid, {
           DEBUG("Doing implicit OFFER-ACK for CDO %s at transport ticket creation (src side) time\n",
                 idstr);
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 56ee19efeee8e5101dcbd1dda5f8ee3d47070098..25093e9caef2294cb5d98390c396adc81fa09606 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -50,7 +50,7 @@ AM_CPPFLAGS = $(TEST_INCLUDES) -DTOPSRCDIR=$(top_srcdir)
 
 LDADD = $(top_builddir)/libmaestro.la
 
-check_HEADERS = cheat.h
+check_HEADERS = cheat.h ecmwf_config.h
 
 TESTS = check_version check_init check_uuid \
 	coverage check_memlock \