diff --git a/src/plugins/select/cray/basil_interface.c b/src/plugins/select/cray/basil_interface.c
index 6336e90425c026aeee4a2525ea8ff6591b952d19..36cf918bc2b3c5c736b2e02da01a05e350e042a3 100644
--- a/src/plugins/select/cray/basil_interface.c
+++ b/src/plugins/select/cray/basil_interface.c
@@ -498,7 +498,7 @@ extern int basil_geometry(struct node_record *node_ptr_array, int node_cnt)
 		 *   o either 2 service nodes (n0/n3)
 		 *   o or 4 compute nodes     (n0..n3)
 		 *   o or 2 gemini chips      (g0/g1 serving n0..n3)
-		 *free_stmt_result
+		 *
 		 * Example: c0-0c1s0n1
 		 *          - c0- = cabinet 0
 		 *          - 0   = row     0
diff --git a/src/plugins/select/cray/libemulate/alps_emulate.c b/src/plugins/select/cray/libemulate/alps_emulate.c
index 76691dc0f894174933a4db8b8f634a509d3eb8e7..c8bc9b11e260ccd0448b98642bace8d3874c0de9 100644
--- a/src/plugins/select/cray/libemulate/alps_emulate.c
+++ b/src/plugins/select/cray/libemulate/alps_emulate.c
@@ -99,7 +99,7 @@ static uint32_t resv_jobid[MAX_RESV_CNT];
  * a cube rather than a long narrow box shape).
  * IN spur_cnt - number of nodes at each coordinate
  * IN/OUT coord - maximum coordinates in each dimension
- * IN dims - -number of dimensions to use */
+ * IN dims - number of dimensions to use */
 static void _get_dims(int spur_cnt, int *coord, int dims)
 {
 	int count = 1, i, j;
@@ -331,10 +331,8 @@ extern int fetch_stmt(MYSQL_STMT *stmt)
 	strncpy(my_bind_col[COL_TYPE].buffer, "compute", BASIL_STRING_SHORT);
 	*((unsigned int *)my_bind_col[COL_CORES].buffer)  =
 			my_node_ptr->config_ptr->cpus;
-	*((my_bool *)my_bind_col[COL_CORES].is_null)  = (my_bool) 0;
 	*((unsigned int *)my_bind_col[COL_MEMORY].buffer) =
 			my_node_ptr->config_ptr->real_memory;
-	*((my_bool *)my_bind_col[COL_MEMORY].is_null)  = (my_bool) 0;
 
 	*((int *)my_bind_col[COL_CAB].buffer) = hw_cabinet;
 	*((int *)my_bind_col[COL_ROW].buffer) = hw_row;
@@ -346,6 +344,19 @@ extern int fetch_stmt(MYSQL_STMT *stmt)
 	*((int *)my_bind_col[COL_Y].buffer) = coord[1];
 	*((int *)my_bind_col[COL_Z].buffer) = coord[2];
 
+	*((my_bool *)my_bind_col[COL_MEMORY].is_null)  = (my_bool) 0;
+	*((my_bool *)my_bind_col[COL_CORES].is_null)  = (my_bool) 0;
+
+	*((my_bool *)my_bind_col[COL_CAB].is_null)  = (my_bool) 0;
+	*((my_bool *)my_bind_col[COL_ROW].is_null)  = (my_bool) 0;
+	*((my_bool *)my_bind_col[COL_CAGE].is_null)  = (my_bool) 0;
+	*((my_bool *)my_bind_col[COL_SLOT].is_null)  = (my_bool) 0;
+	*((my_bool *)my_bind_col[COL_CPU].is_null)  = (my_bool) 0;
+
+	*((my_bool *)my_bind_col[COL_X].is_null)  = (my_bool) 0;
+	*((my_bool *)my_bind_col[COL_Y].is_null)  = (my_bool) 0;
+	*((my_bool *)my_bind_col[COL_Z].is_null)  = (my_bool) 0;
+
 	_incr_hw_recs();
 
 	return 0;
@@ -568,7 +579,7 @@ int basil_signal_apids(int32_t rsvn_id, int signal, struct basil_inventory *inv)
 	usleep(5000);
 #endif
 
-	return ;
+	return 0;
 }
 
 extern bool node_is_allocated(const struct basil_node *node)