diff --git a/ompi/mca/btl/udapl/btl_udapl.c b/ompi/mca/btl/udapl/btl_udapl.c
index a6e9a781b1..1a04ebca17 100644
--- a/ompi/mca/btl/udapl/btl_udapl.c
+++ b/ompi/mca/btl/udapl/btl_udapl.c
@@ -44,6 +44,9 @@
 static int udapl_reg_mr(void *reg_data, void *base, size_t size,
         mca_mpool_base_registration_t *reg);
 static int udapl_dereg_mr(void *reg_data, mca_mpool_base_registration_t *reg);
+static int mca_btl_udapl_set_peer_parameters(
+        struct mca_btl_udapl_module_t* udapl_btl,
+        size_t nprocs);
 
 mca_btl_udapl_module_t mca_btl_udapl_module = {
     {
@@ -416,7 +419,7 @@ int mca_btl_udapl_finalize(struct mca_btl_base_module_t* base_btl)
  * @return                    OMPI_SUCCESS or error status on failure
  */
 
-int mca_btl_udapl_set_peer_parameters(
+static int mca_btl_udapl_set_peer_parameters(
     struct mca_btl_udapl_module_t* udapl_btl,
     size_t nprocs) 
 {
diff --git a/ompi/mca/btl/udapl/btl_udapl.h b/ompi/mca/btl/udapl/btl_udapl.h
index 497ac4e999..a718643831 100644
--- a/ompi/mca/btl/udapl/btl_udapl.h
+++ b/ompi/mca/btl/udapl/btl_udapl.h
@@ -61,7 +61,7 @@ struct mca_btl_udapl_component_t {
     int32_t udapl_num_sends;    /**< number of sends to post on endpoint */
     int32_t udapl_sr_win;       /**< number of fragments recieved before
                                    returning credits to sender */
-    int32_t udapl_timeout;      /**< connection timeout, in microseconds */
+    uint32_t udapl_timeout;      /**< connection timeout, in microseconds */
     size_t udapl_eager_frag_size;
     size_t udapl_max_frag_size;
     size_t udapl_eager_rdma_frag_size; /* size of the rdma fragement including data