diff --git a/orte/mca/oob/tcp/oob_tcp_peer.c b/orte/mca/oob/tcp/oob_tcp_peer.c
index 13fe3be909..91755537af 100644
--- a/orte/mca/oob/tcp/oob_tcp_peer.c
+++ b/orte/mca/oob/tcp/oob_tcp_peer.c
@@ -304,11 +304,11 @@ static int mca_oob_tcp_peer_try_connect(mca_oob_tcp_peer_t* peer)
 #endif
     int rc;
     int connect_sd = -1;
-    opal_socklen_t addrlen;
+    opal_socklen_t addrlen = 0;
 
     do {
         /* pick an address in round-robin fashion from the list exported by the peer */
-        if(ORTE_SUCCESS != mca_oob_tcp_addr_get_next(peer->peer_addr, (struct sockaddr_storage*) &inaddr)) {
+        if(ORTE_SUCCESS != (rc = mca_oob_tcp_addr_get_next(peer->peer_addr, (struct sockaddr_storage*) &inaddr))) {
             opal_output(0, "[%lu,%lu,%lu]-[%lu,%lu,%lu] mca_oob_tcp_peer_try_connect: "
                         "mca_oob_tcp_addr_get_next failed with error=%d",
                         ORTE_NAME_ARGS(orte_process_info.my_name),
diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c
index 546a776c47..881d579563 100644
--- a/orte/mca/rmaps/base/rmaps_base_support_fns.c
+++ b/orte/mca/rmaps/base/rmaps_base_support_fns.c
@@ -452,7 +452,7 @@ int orte_rmaps_base_compute_usage(orte_job_map_t *map, orte_std_cntr_t num_procs
 {
     opal_list_item_t *item, *item2;
     orte_mapped_node_t *mnode;
-    orte_mapped_proc_t *mproc, *psave;
+    orte_mapped_proc_t *mproc, *psave = NULL;
     orte_vpid_t minv, local_rank;
     
     /* set the vpid range for the job */