diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
index 15b10ba9eb..765169d816 100644
--- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
+++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c
@@ -444,7 +444,7 @@ ompi_osc_pt2pt_component_fragment_cb(struct ompi_osc_pt2pt_buffer_t *pt2pt_buffe
 
     buffer = pt2pt_buffer->payload;
     buffer_len = pt2pt_buffer->status._count;
-    module = pt2pt_buffer->cbdata;
+    module = (ompi_osc_pt2pt_module_t*)pt2pt_buffer->cbdata;
 
     /* post a new receive message */
 
diff --git a/ompi/mca/pml/base/pml_base_module_exchange.c b/ompi/mca/pml/base/pml_base_module_exchange.c
index a44bd913c2..30742ca198 100644
--- a/ompi/mca/pml/base/pml_base_module_exchange.c
+++ b/ompi/mca/pml/base/pml_base_module_exchange.c
@@ -291,7 +291,7 @@ mca_pml_base_modex_registry_callback(orte_gpr_notify_data_t * data,
 GOTNAME:
                 /* look up the modex data structure */
                 OPAL_THREAD_LOCK(&mca_pml_base_modex_lock);
-                modex = orte_hash_table_get_proc(&mca_pml_base_modex_data, proc_name);
+                modex = (mca_pml_base_modex_t*)orte_hash_table_get_proc(&mca_pml_base_modex_data, proc_name);
                 if (modex == NULL) {
                     /* create a modex data structure for this proc */
                     modex = OBJ_NEW(mca_pml_base_modex_t);
@@ -633,7 +633,7 @@ mca_pml_base_modex_recv(mca_base_component_t * component,
     if (NULL == (modex = (mca_pml_base_modex_t *) proc->proc_modex)) {
         /* see if we already have data for this proc... */
         OPAL_THREAD_LOCK(&mca_pml_base_modex_lock);
-        modex = orte_hash_table_get_proc(&mca_pml_base_modex_data, &proc->proc_name);
+        modex = (mca_pml_base_modex_t*)orte_hash_table_get_proc(&mca_pml_base_modex_data, &proc->proc_name);
         if (NULL == modex) {
             /* create an empty modex data... */
             modex = OBJ_NEW(mca_pml_base_modex_t);
@@ -703,7 +703,7 @@ mca_pml_base_modex_recv_nb(mca_base_component_t * component,
     if (NULL == (modex = (mca_pml_base_modex_t *) proc->proc_modex)) {
         /* see if we already have data for this proc... */
         OPAL_THREAD_LOCK(&mca_pml_base_modex_lock);
-        modex = orte_hash_table_get_proc(&mca_pml_base_modex_data, &proc->proc_name);
+        modex = (mca_pml_base_modex_t*)orte_hash_table_get_proc(&mca_pml_base_modex_data, &proc->proc_name);
         if (NULL == modex) {
             /* create an empty modex data... */
             modex = OBJ_NEW(mca_pml_base_modex_t);