diff --git a/opal/mca/btl/ugni/btl_ugni.h b/opal/mca/btl/ugni/btl_ugni.h
index b7d2823088c..367391a9ed2 100644
--- a/opal/mca/btl/ugni/btl_ugni.h
+++ b/opal/mca/btl/ugni/btl_ugni.h
@@ -306,7 +306,7 @@ static inline uint32_t mca_btl_ugni_ep_get_device_index (mca_btl_ugni_module_t *
     static volatile uint32_t device_index = (uint32_t) 0;
 
     /* don't really care if the device index is atomically updated */
-    return opal_atomic_fetch_add_32 (&device_index, 1) % mca_btl_ugni_component.virtual_device_count;
+    return opal_atomic_fetch_add_32 ((volatile int32_t *) &device_index, 1) % mca_btl_ugni_component.virtual_device_count;
 }
 
 /**
diff --git a/opal/mca/btl/ugni/btl_ugni_device.h b/opal/mca/btl/ugni/btl_ugni_device.h
index 87e785c5509..0f58b06205a 100644
--- a/opal/mca/btl/ugni/btl_ugni_device.h
+++ b/opal/mca/btl/ugni/btl_ugni_device.h
@@ -243,7 +243,6 @@ mca_btl_ugni_get_rdma_desc_device (mca_btl_ugni_device_t *device, struct mca_btl
 {
     mca_btl_ugni_post_descriptor_t *desc = args->desc;
     mca_btl_ugni_rdma_desc_t *rdma_desc;
-    int count;
 
     args->device = device;
     args->count = 0;
diff --git a/opal/mca/btl/ugni/btl_ugni_frag.h b/opal/mca/btl/ugni/btl_ugni_frag.h
index 4a13a7fcb0f..0c40b350e42 100644
--- a/opal/mca/btl/ugni/btl_ugni_frag.h
+++ b/opal/mca/btl/ugni/btl_ugni_frag.h
@@ -174,8 +174,6 @@ mca_btl_ugni_alloc_rdma_desc (mca_btl_ugni_device_t *device, mca_btl_ugni_post_d
 
 static inline void mca_btl_ugni_return_rdma_desc (mca_btl_ugni_rdma_desc_t *desc)
 {
-    mca_btl_ugni_module_t *ugni_module = mca_btl_ugni_ep_btl (desc->btl_ugni_desc.endpoint);
-
     (void) GNI_EpUnbind (desc->gni_handle);
     opal_free_list_return_st (&desc->device->rdma_descs, &desc->super);
 }
diff --git a/opal/mca/btl/ugni/btl_ugni_module.c b/opal/mca/btl/ugni/btl_ugni_module.c
index 506518b92b5..3993e4c2524 100644
--- a/opal/mca/btl/ugni/btl_ugni_module.c
+++ b/opal/mca/btl/ugni/btl_ugni_module.c
@@ -353,7 +353,7 @@ int mca_btl_ugni_device_handle_event_error (mca_btl_ugni_rdma_desc_t *rdma_desc,
         char char_buffer[1024];
         GNI_CqErrorStr (event_data, char_buffer, sizeof (char_buffer));
 
-        BTL_ERROR(("giving up on desciptor %p, recoverable %d: %s", rdma_desc, recoverable, char_buffer));
+        BTL_ERROR(("giving up on desciptor %p, recoverable %d: %s", (void *) rdma_desc, recoverable, char_buffer));
 
         return OPAL_ERROR;
     }
diff --git a/opal/mca/btl/ugni/btl_ugni_rdma.h b/opal/mca/btl/ugni/btl_ugni_rdma.h
index b474b835bdd..31096d2fcb4 100644
--- a/opal/mca/btl/ugni/btl_ugni_rdma.h
+++ b/opal/mca/btl/ugni/btl_ugni_rdma.h
@@ -134,8 +134,8 @@ static inline int mca_btl_ugni_post (mca_btl_base_endpoint_t *endpoint, int get,
 {
     const gni_post_type_t fma_ops[2] = {GNI_POST_FMA_PUT, GNI_POST_FMA_GET};
     const gni_post_type_t rdma_ops[2] = {GNI_POST_RDMA_PUT, GNI_POST_RDMA_GET};
-    const long int fma_limit = get ? mca_btl_ugni_component.ugni_fma_get_limit :
-        mca_btl_ugni_component.ugni_fma_put_limit;
+    const size_t fma_limit = (size_t) (get ? mca_btl_ugni_component.ugni_fma_get_limit :
+                                       mca_btl_ugni_component.ugni_fma_put_limit);
 
     if (size <= fma_limit) {
         return mca_btl_ugni_post_fma (endpoint, fma_ops[get], size, local_address, remote_address,