diff --git a/ompi/attribute/attribute_predefined.c b/ompi/attribute/attribute_predefined.c
index fb1134ff75..dec1d3f743 100644
--- a/ompi/attribute/attribute_predefined.c
+++ b/ompi/attribute/attribute_predefined.c
@@ -301,7 +301,7 @@ void ompi_attr_create_predefined_callback(
     orte_gpr_keyval_t **keyval;
     orte_gpr_value_t **value;
     orte_jobid_t job;
-    orte_std_cntr_t *cptr, rank, app_num;
+    orte_std_cntr_t *cptr, rank, app_num = 0;
     unsigned int universe_size = 0;
     int rc;
 
diff --git a/orte/mca/ns/replica/ns_replica_general_fns.c b/orte/mca/ns/replica/ns_replica_general_fns.c
index b56f107e29..adbe4cb8b6 100644
--- a/orte/mca/ns/replica/ns_replica_general_fns.c
+++ b/orte/mca/ns/replica/ns_replica_general_fns.c
@@ -125,8 +125,8 @@ int orte_ns_replica_get_peers(orte_process_name_t **procs,
         orte_ns_replica_construct_flattened_tree(&peerlist, job_info);
         
         i = opal_list_get_size(&peerlist);
+        npeers = 0;
         if (0 < i) {
-            npeers = 0;
             for (item = opal_list_get_first(&peerlist);
                  item != opal_list_get_end(&peerlist);
                  item = opal_list_get_next(item)) {
diff --git a/orte/mca/oob/base/oob_base_xcast.c b/orte/mca/oob/base/oob_base_xcast.c
index f962c5307d..671b09b9d4 100644
--- a/orte/mca/oob/base/oob_base_xcast.c
+++ b/orte/mca/oob/base/oob_base_xcast.c
@@ -66,7 +66,7 @@ int mca_oob_xcast(orte_jobid_t job,
                   orte_buffer_t* buffer,
                   orte_gpr_trigger_cb_fn_t cbfunc)
 {
-    int rc;
+    int rc = ORTE_SUCCESS;
     struct timeval start, stop;
     
     if (orte_oob_xcast_timing) {
diff --git a/orte/mca/pls/base/pls_base_dmn_registry_fns.c b/orte/mca/pls/base/pls_base_dmn_registry_fns.c
index 4f947fbbf4..e7ce13e204 100644
--- a/orte/mca/pls/base/pls_base_dmn_registry_fns.c
+++ b/orte/mca/pls/base/pls_base_dmn_registry_fns.c
@@ -310,7 +310,7 @@ int orte_pls_base_get_active_daemons(opal_list_t *daemons, orte_jobid_t job, opa
 CLEANUP:
     if (allocated) free(jobs);
     
-    return rc;
+    return ORTE_SUCCESS;
 }
 
 /*
diff --git a/orte/tools/orteboot/orteboot.c b/orte/tools/orteboot/orteboot.c
index 1b81b2786f..5033a090af 100644
--- a/orte/tools/orteboot/orteboot.c
+++ b/orte/tools/orteboot/orteboot.c
@@ -177,7 +177,7 @@ extern char** environ;
 
 int main(int argc, char *argv[])
 {
-    int rc, ret;
+    int rc;
     int id, iparam;
     opal_cmd_line_t cmd_line;
 
@@ -202,14 +202,14 @@ int main(int argc, char *argv[])
     /* Setup and parse the command line */
     opal_cmd_line_create(&cmd_line, cmd_line_init);
     mca_base_cmd_line_setup(&cmd_line);
-    if (ORTE_SUCCESS != (ret = opal_cmd_line_parse(&cmd_line, true,
+    if (ORTE_SUCCESS != (rc = opal_cmd_line_parse(&cmd_line, true,
                                                    argc, argv))) {
         char *args = NULL;
         args = opal_cmd_line_get_usage_msg(&cmd_line);
         opal_show_help("help-orteboot.txt", "orteboot:usage", false,
                        argv[0], args);
         free(args);
-        return ret;
+        return rc;
     }
     
     /* print version if requested.  Do this before check for help so
@@ -312,7 +312,7 @@ int main(int argc, char *argv[])
     /* just do a fork/exec of orted --seed --persistent and then exit */
     
     
-     free(orteboot_basename);
-    return rc;
+    free(orteboot_basename);
+    return ORTE_SUCCESS;
 }