diff --git a/src/plugins/select/bluegene/block_allocator/block_allocator.c b/src/plugins/select/bluegene/block_allocator/block_allocator.c
index 58659296119ba74a20c84b2fd81acbc6f928de22..8dc26c2d7b5e46e03ac1d3bd2fb2734eea357b4d 100644
--- a/src/plugins/select/bluegene/block_allocator/block_allocator.c
+++ b/src/plugins/select/bluegene/block_allocator/block_allocator.c
@@ -1036,8 +1036,11 @@ extern void set_node_list(List nodes)
 	itr = list_iterator_create(nodes);
 	while ((ba_node = list_next(itr))) {
 		curr_ba_node = &ba_system_ptr->grid[ba_node->coord[X]]
+#ifdef HAVE_BG
 			[ba_node->coord[Y]]
-			[ba_node->coord[Z]];
+			[ba_node->coord[Z]]
+#endif
+			;
 		memcpy(curr_ba_node, ba_node, sizeof(ba_node_t));
 	}
 	list_iterator_destroy(itr);
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 0235c0efb120542200885be00e876a5701561945..73982d420cf9b96ba5c9b5a45042b3a7f7fe26b5 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -1415,7 +1415,10 @@ extern void build_node_details(struct job_record *job_ptr)
 			error("Invalid node %s in JobId=%u",
 			      this_node_name, job_ptr->job_id);
 		}
- cleanup:	free(this_node_name);
+#ifdef HAVE_BG
+ cleanup:	
+#endif
+		free(this_node_name);
 	}
 	hostlist_destroy(host_list);
 	if (job_ptr->node_cnt != node_inx) {