diff --git a/orte/mca/ras/base/ras_base_open.c b/orte/mca/ras/base/ras_base_open.c
index 8b1cc59105..68bee19593 100644
--- a/orte/mca/ras/base/ras_base_open.c
+++ b/orte/mca/ras/base/ras_base_open.c
@@ -142,14 +142,6 @@ int orte_ras_base_open(void)
         orte_ras_base.timing = false;
     }
     
-    /* Open up all available components */
-    if (ORTE_SUCCESS != 
-        mca_base_components_open("ras", orte_ras_base.ras_output,
-                                 mca_ras_base_static_components, 
-                                 &orte_ras_base.ras_opened, true)) {
-        return ORTE_ERROR;
-    }
-
     /* if we are not on a HNP, select the proxy 'module' */
     if (!orte_process_info.seed) {
         orte_ras = orte_ras_base_proxy_module;
@@ -158,6 +150,14 @@ int orte_ras_base_open(void)
         orte_ras_base.ras_using_proxy = true;
         return ORTE_SUCCESS;
     }
+    
+    /* Open up all available components */
+    if (ORTE_SUCCESS != 
+        mca_base_components_open("ras", orte_ras_base.ras_output,
+                                 mca_ras_base_static_components, 
+                                 &orte_ras_base.ras_opened, true)) {
+        return ORTE_ERROR;
+    }
 
     /* All done */
 
diff --git a/orte/mca/rmgr/base/rmgr_base_vpid_support_fns.c b/orte/mca/rmgr/base/rmgr_base_vpid_support_fns.c
index 5a38738ba5..49d0b7f765 100644
--- a/orte/mca/rmgr/base/rmgr_base_vpid_support_fns.c
+++ b/orte/mca/rmgr/base/rmgr_base_vpid_support_fns.c
@@ -214,6 +214,7 @@ int orte_rmgr_base_set_proc_info(const orte_process_name_t* name, pid_t pid, cha
     }
 
     OBJ_RELEASE(values[0]);
+    free(segment);
 
     return rc;
 }
diff --git a/orte/mca/sds/bproc/sds_bproc_component.c b/orte/mca/sds/bproc/sds_bproc_component.c
index 851fda41d2..1cd21489aa 100644
--- a/orte/mca/sds/bproc/sds_bproc_component.c
+++ b/orte/mca/sds/bproc/sds_bproc_component.c
@@ -82,8 +82,16 @@ orte_sds_bproc_component_init(int *priority)
     id = mca_base_param_register_string("ns", "nds", NULL, NULL, NULL);
     mca_base_param_lookup_string(id, &mode);
 
-    if (NULL == mode || 0 != strcmp("bproc", mode)) { return NULL; }
+    if (NULL == mode || 0 != strcmp("bproc", mode)) { 
+        if(NULL != mode) {
+            free(mode);
+        }
+        return NULL; 
+    }
 
+    if(NULL != mode) {
+        free(mode);
+    }
     *priority = 20;
     return &orte_sds_bproc_module;
 }
diff --git a/orte/mca/sds/cnos/sds_cnos_component.c b/orte/mca/sds/cnos/sds_cnos_component.c
index 953f3b9dfc..605a856a65 100644
--- a/orte/mca/sds/cnos/sds_cnos_component.c
+++ b/orte/mca/sds/cnos/sds_cnos_component.c
@@ -84,7 +84,10 @@ orte_sds_cnos_component_init(int *priority)
 
     /* if mode isn't NULL, then we have an ORTE starter.  Don't use
        this component */
-    if (NULL != mode) return NULL;
+    if (NULL != mode) {
+        free(mode);
+        return NULL;
+    }
 
     *priority = 60;
     return &orte_sds_cnos_module;
diff --git a/orte/mca/sds/env/sds_env_component.c b/orte/mca/sds/env/sds_env_component.c
index 1081048ed8..34d7713f3f 100644
--- a/orte/mca/sds/env/sds_env_component.c
+++ b/orte/mca/sds/env/sds_env_component.c
@@ -80,7 +80,16 @@ orte_sds_env_component_init(int *priority)
     id = mca_base_param_register_string("ns", "nds", NULL, NULL, NULL);
     mca_base_param_lookup_string(id, &mode);
 
-    if (NULL == mode || 0 != strcmp("env", mode)) { return NULL; }
+    if (NULL == mode || 0 != strcmp("env", mode)) { 
+        if(NULL != mode) {
+            free(mode);
+        }
+        return NULL; 
+    }
+    
+    if(NULL != mode) {
+        free(mode);
+    }
 
     *priority = 20;
     return &orte_sds_env_module;
diff --git a/orte/mca/sds/pipe/sds_pipe_component.c b/orte/mca/sds/pipe/sds_pipe_component.c
index 174dd7ad16..85806e4808 100644
--- a/orte/mca/sds/pipe/sds_pipe_component.c
+++ b/orte/mca/sds/pipe/sds_pipe_component.c
@@ -82,8 +82,16 @@ orte_sds_pipe_component_init(int *priority)
     id = mca_base_param_register_string("ns", "nds", NULL, NULL, NULL);
     mca_base_param_lookup_string(id, &mode);
 
-    if (NULL == mode || 0 != strcmp("pipe", mode)) { return NULL; }
+    if (NULL == mode || 0 != strcmp("pipe", mode)) { 
+        if(NULL != mode) {
+            free(mode);
+        }
+        return NULL; 
+    }
 
+    if(NULL != mode) {
+        free(mode);
+    }
     *priority = 20;
     return &orte_sds_pipe_module;
 }
diff --git a/orte/mca/sds/portals_utcp/sds_portals_utcp_component.c b/orte/mca/sds/portals_utcp/sds_portals_utcp_component.c
index 9de2ec3a82..e4c7c8f85a 100644
--- a/orte/mca/sds/portals_utcp/sds_portals_utcp_component.c
+++ b/orte/mca/sds/portals_utcp/sds_portals_utcp_component.c
@@ -83,7 +83,10 @@ orte_sds_portals_utcp_component_init(int *priority)
 
     /* if mode isn't NULL, then we have an ORTE starter.  Don't use
        this component */
-    if (NULL != mode) return NULL;
+    if (NULL != mode) {
+        free(mode);
+        return NULL;
+    }
     if (NULL == getenv("PTL_MY_RID")) return NULL;
 
     *priority = 60;
diff --git a/orte/mca/sds/slurm/sds_slurm_component.c b/orte/mca/sds/slurm/sds_slurm_component.c
index c4ef9379d5..4851cb35a8 100644
--- a/orte/mca/sds/slurm/sds_slurm_component.c
+++ b/orte/mca/sds/slurm/sds_slurm_component.c
@@ -85,10 +85,16 @@ orte_sds_slurm_component_init(int *priority)
     id = mca_base_param_register_string("ns", "nds", NULL, NULL, NULL);
     mca_base_param_lookup_string(id, &mode);
 
-    if (NULL == mode || 0 != strcmp("slurm", mode)) { 
+    if (NULL == mode || 0 != strcmp("slurm", mode)) {
+        if(NULL != mode) {
+            free(mode);
+        }
         return NULL; 
     }
 
+    if(NULL != mode) {
+        free(mode);
+    }
     *priority = 20;
     return &orte_sds_slurm_module;
 }
diff --git a/orte/mca/sds/xcpu/sds_xcpu_component.c b/orte/mca/sds/xcpu/sds_xcpu_component.c
index 13651d5942..5c0d539714 100644
--- a/orte/mca/sds/xcpu/sds_xcpu_component.c
+++ b/orte/mca/sds/xcpu/sds_xcpu_component.c
@@ -82,8 +82,16 @@ orte_sds_xcpu_component_init(int *priority)
     id = mca_base_param_register_string("ns", "nds", NULL, NULL, NULL);
     mca_base_param_lookup_string(id, &mode);
 
-    if (NULL == mode || 0 != strcmp("xcpu", mode)) { return NULL; }
+    if (NULL == mode || 0 != strcmp("xcpu", mode)) { 
+        if(NULL != mode) {
+            free(mode);
+        }
+        return NULL; 
+    }
 
+    if(NULL != mode) {
+        free(mode);
+    }
     *priority = 30;
     return &orte_sds_xcpu_module;
 }