diff --git a/orte/mca/rmaps/staged/rmaps_staged.c b/orte/mca/rmaps/staged/rmaps_staged.c
index cde5a961e8..83ce4c0949 100644
--- a/orte/mca/rmaps/staged/rmaps_staged.c
+++ b/orte/mca/rmaps/staged/rmaps_staged.c
@@ -284,7 +284,6 @@ static int staged_mapper(orte_job_t *jdata)
                 OBJ_RETAIN(node);  /* maintain accounting on object */
                 jdata->map->num_nodes++;
             }
-        moveon:
             if (0 == opal_list_get_size(&node_list)) {
                 /* nothing more we can do */
                 break;
diff --git a/orte/runtime/orte_globals.c b/orte/runtime/orte_globals.c
index bbdbf8a318..371d3456d6 100644
--- a/orte/runtime/orte_globals.c
+++ b/orte/runtime/orte_globals.c
@@ -604,7 +604,7 @@ static void orte_app_context_construct(orte_app_context_t* app_context)
 #endif
     app_context->recovery_defined = false;
     app_context->max_restarts = -1000;
-    app_context->max_procs_per_node = -1;
+    app_context->max_procs_per_node = 0;
 }
 
 static void orte_app_context_destructor(orte_app_context_t* app_context)
diff --git a/orte/runtime/orte_globals.h b/orte/runtime/orte_globals.h
index 1a82b69838..17d1cf3e22 100644
--- a/orte/runtime/orte_globals.h
+++ b/orte/runtime/orte_globals.h
@@ -292,7 +292,7 @@ typedef struct {
     /* max number of times a process can be restarted */
     int32_t max_restarts;
     /* maximum number of procs/node for this app */
-    int32_t max_procs_per_node;
+    orte_vpid_t max_procs_per_node;
 } orte_app_context_t;
 
 ORTE_DECLSPEC OBJ_CLASS_DECLARATION(orte_app_context_t);