diff --git a/ompi/mca/btl/mx/btl_mx_proc.c b/ompi/mca/btl/mx/btl_mx_proc.c
index 8a3e8217b2..d0492f40a0 100644
--- a/ompi/mca/btl/mx/btl_mx_proc.c
+++ b/ompi/mca/btl/mx/btl_mx_proc.c
@@ -135,21 +135,21 @@ int mca_btl_mx_proc_insert( mca_btl_mx_proc_t* module_proc,
                             mca_btl_mx_endpoint_t* module_endpoint )
 {
     mca_btl_mx_addr_t  *mx_peers;
-    int rc;
-    size_t size, i;
+    int rc, i;
+    size_t size;
 
     /* query for the peer address info */
     rc = mca_pml_base_modex_recv( &mca_btl_mx_component.super.btl_version,
                                   module_proc->proc_ompi, (void*)&mx_peers, &size );
     if( OMPI_SUCCESS != rc ) {
-        opal_output( 0, "mca_pml_base_modex_recv failed for peer [%d,%d,%d]",
+        opal_output( 0, "mca_pml_base_modex_recv failed for peer [%ld,%ld,%ld]",
                      ORTE_NAME_ARGS(&module_proc->proc_ompi->proc_name) );
         OBJ_RELEASE(module_proc);
         return OMPI_ERR_OUT_OF_RESOURCE;
     }
 
     if( (size % sizeof(mca_btl_mx_addr_t)) != 0 ) {
-        opal_output( 0, "invalid mx address for peer [%d,%d,%d]",
+        opal_output( 0, "invalid mx address for peer [%ld,%ld,%ld]",
                      ORTE_NAME_ARGS(&module_proc->proc_ompi->proc_name) );
         OBJ_RELEASE(module_proc);
         return OMPI_ERROR;
diff --git a/ompi/mca/btl/openib/btl_openib_mca.c b/ompi/mca/btl/openib/btl_openib_mca.c
index 886face1f8..6815a6d404 100644
--- a/ompi/mca/btl/openib/btl_openib_mca.c
+++ b/ompi/mca/btl/openib/btl_openib_mca.c
@@ -375,6 +375,9 @@ int btl_openib_register_mca_params(void)
                   "of network (must be >= 1)", 
                   800, &ival, REGINT_GE_ONE));
     mca_btl_openib_module.super.btl_bandwidth = (uint32_t) ival;
+    CHECK(reg_int("latency", "Approximate latency of the device (must be >= 1)", 
+                  10, &ival, REGINT_GE_ONE));
+    mca_btl_openib_module.super.btl_latency = (uint32_t) ival;
     
     return ret;
 }
diff --git a/ompi/mca/btl/sm/btl_sm.c b/ompi/mca/btl/sm/btl_sm.c
index 2d23205b78..c5a1564840 100644
--- a/ompi/mca/btl/sm/btl_sm.c
+++ b/ompi/mca/btl/sm/btl_sm.c
@@ -338,8 +338,8 @@ int mca_btl_sm_add_procs_same_base_addr(
                         mca_btl_sm_component.sm_resouce_ctl_file,
                         sizeof(mca_btl_sm_module_resource_t), 0))) 
         {
-            opal_output(0, "mca_btl_sm_add_procs: unable to create shared memory BTL coordinating strucure :: size %ld \n",
-                    size);
+            opal_output(0, "mca_btl_sm_add_procs: unable to create shared memory BTL coordinating strucure :: size %lu \n",
+                    (unsigned long)size);
             return_code=OMPI_ERROR;
             goto CLEANUP;
         }