diff --git a/ompi/mca/bml/bml.h b/ompi/mca/bml/bml.h
index 805c33bde4..4d987145ee 100644
--- a/ompi/mca/bml/bml.h
+++ b/ompi/mca/bml/bml.h
@@ -255,7 +255,7 @@ static inline void mca_bml_base_completion(
                                            struct mca_btl_base_descriptor_t* des,
                                            int status)
 {
-    mca_bml_base_context_t* ctx = des->des_cbdata;
+    mca_bml_base_context_t* ctx = (mca_bml_base_context_t*) des->des_cbdata;
     /* restore original state */
     ((unsigned char*)des->des_src[0].seg_addr.pval)[ctx->index] ^= ~0;
     des->des_cbdata = ctx->cbdata;
@@ -273,16 +273,17 @@ static inline int mca_bml_base_send(
 { 
     static int count;
     if(count <= 0) {
-        count = ((1000.0 * rand())/(RAND_MAX+1.0));
+        count = (int) ((1000.0 * rand())/(RAND_MAX+1.0));
         if(count % 2) {
             /* local completion - network "drops" packet */
             des->des_cbfunc(bml_btl->btl, bml_btl->btl_endpoint, des, OMPI_SUCCESS);
             return OMPI_SUCCESS;
         } else {
             /* corrupt data */
-            mca_bml_base_context_t* ctx = malloc(sizeof(mca_bml_base_context_t));
+            mca_bml_base_context_t* ctx = (mca_bml_base_context_t*) 
+                malloc(sizeof(mca_bml_base_context_t));
             if(NULL != ctx) {
-                ctx->index = (des->des_src[0].seg_len * rand() * 1.0) / (RAND_MAX + 1.0);
+                ctx->index = (size_t) ((des->des_src[0].seg_len * rand() * 1.0) / (RAND_MAX + 1.0));
                 ctx->cbfunc = des->des_cbfunc;
                 ctx->cbdata = des->des_cbdata;
                 ((unsigned char*)des->des_src[0].seg_addr.pval)[ctx->index] ^= ~0;
diff --git a/ompi/mca/pml/dr/pml_dr.c b/ompi/mca/pml/dr/pml_dr.c
index a62d90feb4..5fbebf1cc8 100644
--- a/ompi/mca/pml/dr/pml_dr.c
+++ b/ompi/mca/pml/dr/pml_dr.c
@@ -174,9 +174,10 @@ int mca_pml_dr_component_fini(void)
     return OMPI_SUCCESS;
 }
 
-void mca_pml_dr_dump(
+int mca_pml_dr_dump(
     struct ompi_communicator_t* comm,
     int verbose)
 {
+    return OMPI_SUCCESS;
 }
 
diff --git a/ompi/mca/pml/dr/pml_dr.h b/ompi/mca/pml/dr/pml_dr.h
index 8b2c365142..4d56bbf90c 100644
--- a/ompi/mca/pml/dr/pml_dr.h
+++ b/ompi/mca/pml/dr/pml_dr.h
@@ -211,7 +211,7 @@ extern int mca_pml_dr_recv(
     ompi_status_public_t* status
 );
 
-extern void mca_pml_dr_dump(
+extern int mca_pml_dr_dump(
     struct ompi_communicator_t* comm,
     int verbose
 );
diff --git a/ompi/mca/pml/ob1/pml_ob1.c b/ompi/mca/pml/ob1/pml_ob1.c
index 0f83ca682d..14853ff1f5 100644
--- a/ompi/mca/pml/ob1/pml_ob1.c
+++ b/ompi/mca/pml/ob1/pml_ob1.c
@@ -181,7 +181,7 @@ int mca_pml_ob1_component_fini(void)
  * diagnostics
  */
 
-void mca_pml_ob1_dump(struct ompi_communicator_t* comm, int verbose)
+int mca_pml_ob1_dump(struct ompi_communicator_t* comm, int verbose)
 {
     struct mca_pml_comm_t* pml_comm = comm->c_pml_comm;
     size_t i;
@@ -201,5 +201,6 @@ void mca_pml_ob1_dump(struct ompi_communicator_t* comm, int verbose)
             bml_btl->btl->btl_dump(bml_btl->btl, bml_btl->btl_endpoint, verbose);
         }
     }
+    return OMPI_SUCCESS;
 }
 
diff --git a/ompi/mca/pml/ob1/pml_ob1.h b/ompi/mca/pml/ob1/pml_ob1.h
index 3788c3bef5..a6f78049b3 100644
--- a/ompi/mca/pml/ob1/pml_ob1.h
+++ b/ompi/mca/pml/ob1/pml_ob1.h
@@ -200,7 +200,7 @@ extern int mca_pml_ob1_recv(
     ompi_status_public_t* status
 );
 
-extern void mca_pml_ob1_dump(
+extern int mca_pml_ob1_dump(
     struct ompi_communicator_t* comm,
     int verbose
 );