diff --git a/orte/mca/pls/xgrid/src/pls_xgrid_client.m b/orte/mca/pls/xgrid/src/pls_xgrid_client.m
index f348333daf..09193f2d52 100644
--- a/orte/mca/pls/xgrid/src/pls_xgrid_client.m
+++ b/orte/mca/pls/xgrid/src/pls_xgrid_client.m
@@ -251,7 +251,7 @@ mca_pls_xgrid_set_node_name(orte_ras_node_t* node,
     /* query the list of nodes allocated to the job */
     OBJ_CONSTRUCT(&nodes, opal_list_t);
     OBJ_CONSTRUCT(&mapping_list, opal_list_t);
-    rc = orte_rmaps_base_mapped_node_query(&mapping_list, &nodes, jobid);
+    ret = orte_rmaps_base_mapped_node_query(&mapping_list, &nodes, jobid);
     if (ORTE_SUCCESS != ret) goto cleanup;
 
     /* allocate vpids for the daemons */
diff --git a/orte/mca/ras/xgrid/src/ras_xgrid_module.c b/orte/mca/ras/xgrid/src/ras_xgrid_module.c
index bdf3ad347f..d36e9c6d3b 100644
--- a/orte/mca/ras/xgrid/src/ras_xgrid_module.c
+++ b/orte/mca/ras/xgrid/src/ras_xgrid_module.c
@@ -149,7 +149,7 @@ static int discover(orte_jobid_t jobid, opal_list_t* nodelist)
         node->node_state = ORTE_NODE_STATE_UP;
         node->node_cellid = 0;
         node->node_slots_inuse = 0;
-        node->node_slots_max = 1;
+        node->node_slots_max = 0;
         node->node_slots = 1;
         opal_list_append(&new_nodes, &node->super);
     }