diff --git a/src/common/read_config.c b/src/common/read_config.c
index 94e5a56c29eb2b25d3c707a553f6f845f1abd7b9..cb915607d1030ab400c48921c20e2bef12eecb17 100644
--- a/src/common/read_config.c
+++ b/src/common/read_config.c
@@ -2515,6 +2515,12 @@ _validate_and_set_defaults(slurm_ctl_conf_t *conf, s_p_hashtbl_t *hashtbl)
 	if (!s_p_get_uint16(&conf->unkillable_timeout,
 			    "UnkillableStepTimeout", hashtbl))
 		conf->unkillable_timeout = DEFAULT_UNKILLABLE_TIMEOUT;
+
+#ifdef HAVE_BG
+	if (conf->node_prefix == NULL)
+		fatal("No valid node name prefix identified");
+#endif
+
 	xfree(default_storage_type);
 	xfree(default_storage_loc);
 	xfree(default_storage_host);
diff --git a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
index 388c4333f4af16e36be5a65e760920a6f163cb1b..771c98f339e81801c79cda8ae5d477875d3b4f68 100644
--- a/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
+++ b/src/plugins/accounting_storage/mysql/accounting_storage_mysql.c
@@ -3035,7 +3035,7 @@ static int _mysql_acct_check_tables(MYSQL *db_conn)
 		{ "max_vsize", "bigint unsigned default 0 not null" },
 		{ "max_vsize_task", "smallint unsigned default 0 not null" },
 		{ "max_vsize_node", "int unsigned default 0 not null" },
-		{ "ave_vsize", "double default 0.0 not null" },
+		{ "ave_vsize", "double unsigned default 0.0 not null" },
 		{ "max_rss", "bigint unsigned default 0 not null" },
 		{ "max_rss_task", "smallint unsigned default 0 not null" },
 		{ "max_rss_node", "int unsigned default 0 not null" },