diff --git a/opal/mca/btl/openib/btl_openib.c b/opal/mca/btl/openib/btl_openib.c
index 9db3d8e0b9..55023a8544 100644
--- a/opal/mca/btl/openib/btl_openib.c
+++ b/opal/mca/btl/openib/btl_openib.c
@@ -1447,11 +1447,15 @@ mca_btl_base_descriptor_t* mca_btl_openib_prepare_src(
     size_t* size,
     uint32_t flags)
 {
+    mca_btl_openib_module_t *openib_btl;
     mca_btl_openib_com_frag_t *frag = NULL;
     struct iovec iov;
     uint32_t iov_count = 1;
     size_t max_data = *size;
     void *ptr;
+    int rc;
+
+    openib_btl = (mca_btl_openib_module_t*)btl;
 
     assert(MCA_BTL_NO_ORDER == order);
 
diff --git a/opal/mca/btl/openib/btl_openib.h b/opal/mca/btl/openib/btl_openib.h
index 82e950b618..6b1cfdbc8a 100644
--- a/opal/mca/btl/openib/btl_openib.h
+++ b/opal/mca/btl/openib/btl_openib.h
@@ -743,7 +743,7 @@ int mca_btl_openib_atomic_fop (struct mca_btl_base_module_t *btl, struct mca_btl
                                void *local_address, uint64_t remote_address,
                                struct mca_btl_base_registration_handle_t *local_handle,
                                struct mca_btl_base_registration_handle_t *remote_handle, mca_btl_base_atomic_op_t op,
-                               uint64_t operand, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
+                               int64_t operand, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
                                void *cbcontext, void *cbdata);
 
 /**
@@ -788,8 +788,8 @@ int mca_btl_openib_atomic_fop (struct mca_btl_base_module_t *btl, struct mca_btl
 int mca_btl_openib_atomic_cswap (struct mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *endpoint,
                                  void *local_address, uint64_t remote_address,
                                  struct mca_btl_base_registration_handle_t *local_handle,
-                                 struct mca_btl_base_registration_handle_t *remote_handle, uint64_t compare,
-                                 uint64_t value, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
+                                 struct mca_btl_base_registration_handle_t *remote_handle, int64_t compare,
+                                 int64_t value, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
                                  void *cbcontext, void *cbdata);
 
 /**
diff --git a/opal/mca/btl/openib/btl_openib_atomic.c b/opal/mca/btl/openib/btl_openib_atomic.c
index 3200a9097f..804d099313 100644
--- a/opal/mca/btl/openib/btl_openib_atomic.c
+++ b/opal/mca/btl/openib/btl_openib_atomic.c
@@ -107,7 +107,7 @@ int mca_btl_openib_atomic_fop (struct mca_btl_base_module_t *btl, struct mca_btl
                                void *local_address, uint64_t remote_address,
                                struct mca_btl_base_registration_handle_t *local_handle,
                                struct mca_btl_base_registration_handle_t *remote_handle, mca_btl_base_atomic_op_t op,
-                               uint64_t operand, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
+                               int64_t operand, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
                                void *cbcontext, void *cbdata)
 {
 
@@ -123,8 +123,8 @@ int mca_btl_openib_atomic_fop (struct mca_btl_base_module_t *btl, struct mca_btl
 int mca_btl_openib_atomic_cswap (struct mca_btl_base_module_t *btl, struct mca_btl_base_endpoint_t *endpoint,
                                  void *local_address, uint64_t remote_address,
                                  struct mca_btl_base_registration_handle_t *local_handle,
-                                 struct mca_btl_base_registration_handle_t *remote_handle, uint64_t compare,
-                                 uint64_t value, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
+                                 struct mca_btl_base_registration_handle_t *remote_handle, int64_t compare,
+                                 int64_t value, int flags, int order, mca_btl_base_rdma_completion_fn_t cbfunc,
                                  void *cbcontext, void *cbdata)
 {
     return mca_btl_openib_atomic_internal (btl, endpoint, local_address, remote_address, local_handle,
diff --git a/opal/mca/btl/openib/btl_openib_component.c b/opal/mca/btl/openib/btl_openib_component.c
index 1fb2e6f1c1..8f3ca3cfae 100644
--- a/opal/mca/btl/openib/btl_openib_component.c
+++ b/opal/mca/btl/openib/btl_openib_component.c
@@ -2044,7 +2044,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev)
                from the default, we're ok.  But if the
                component.receive_queues value came from the 1st
                device's INI file, we must error. */
-            else if ((mca_base_var_source_t) BTL_OPENIB_RQ_SOURCE_DEVICE_INI ==
+            else if (BTL_OPENIB_RQ_SOURCE_DEVICE_INI ==
                 mca_btl_openib_component.receive_queues_source) {
                 opal_show_help("help-mpi-btl-openib.txt",
                                "locally conflicting receive_queues", true,