diff --git a/ompi/mca/btl/udapl/btl_udapl.c b/ompi/mca/btl/udapl/btl_udapl.c
index c3ca29a94a..a95c97142e 100644
--- a/ompi/mca/btl/udapl/btl_udapl.c
+++ b/ompi/mca/btl/udapl/btl_udapl.c
@@ -21,6 +21,7 @@
  */
 
 #include "ompi_config.h"
+#include <errno.h> 
 #include <string.h>
 #include "opal/util/output.h"
 #include "opal/util/if.h"
@@ -422,7 +423,8 @@ int mca_btl_udapl_free(
     mca_btl_udapl_frag_t* frag = (mca_btl_udapl_frag_t*)des;
 
     if(frag->size == 0 && frag->registration != NULL) {
-        btl->btl_mpool->mpool_deregister(btl->btl_mpool, frag->registration);
+        btl->btl_mpool->mpool_deregister(btl->btl_mpool,
+	    (mca_mpool_base_registration_t*)frag->registration);
         MCA_BTL_UDAPL_FRAG_RETURN_USER(btl, frag); 
     } else if(frag->size == mca_btl_udapl_component.udapl_eager_frag_size) {
         MCA_BTL_UDAPL_FRAG_RETURN_EAGER(btl, frag); 
diff --git a/ompi/mca/btl/udapl/btl_udapl_frag.c b/ompi/mca/btl/udapl/btl_udapl_frag.c
index f5e4c3f00a..89c2ef033c 100644
--- a/ompi/mca/btl/udapl/btl_udapl_frag.c
+++ b/ompi/mca/btl/udapl/btl_udapl_frag.c
@@ -36,7 +36,7 @@ static void mca_btl_udapl_frag_common_constructor(mca_btl_udapl_frag_t* frag)
     frag->base.des_flags = 0;
 #endif
 
-    frag->registration = (mca_mpool_base_registration_t*)reg; 
+    frag->registration = reg; 
     frag->segment.seg_addr.pval = (unsigned char*)(frag + 1); 
     frag->ftr = NULL;