diff --git a/src/api/config_info.c b/src/api/config_info.c
index 9089c665d650de24c0e5ebfc5c09c1dabba9e4f2..14e4a2e7ba8ebb044406f25ead93ad262c5699f6 100644
--- a/src/api/config_info.c
+++ b/src/api/config_info.c
@@ -268,17 +268,19 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
 
 	key_pair = xmalloc(sizeof(config_key_pair_t));
 	list_append(ret_list, key_pair);
-	key_pair->name = xstrdup("DefMemPerCPU");
 	if (slurm_ctl_conf_ptr->def_mem_per_cpu & MEM_PER_CPU) {
+		key_pair->name = xstrdup("DefMemPerCPU");
 		snprintf(tmp_str, sizeof(tmp_str), "%u",
 			 slurm_ctl_conf_ptr->def_mem_per_cpu &
 			 (~MEM_PER_CPU));
 		key_pair->value = xstrdup(tmp_str);
 	} else if (slurm_ctl_conf_ptr->def_mem_per_cpu) {
+		key_pair->name = xstrdup("DefMemPerNode");
 		snprintf(tmp_str, sizeof(tmp_str), "%u",
 			 slurm_ctl_conf_ptr->def_mem_per_cpu);
 		key_pair->value = xstrdup(tmp_str);
 	} else {
+		key_pair->name = xstrdup("DefMemPerNode");
 		key_pair->value = xstrdup("UNLIMITED");
 	}
 
@@ -513,17 +515,19 @@ extern void *slurm_ctl_conf_2_key_pairs (slurm_ctl_conf_t* slurm_ctl_conf_ptr)
 
 	key_pair = xmalloc(sizeof(config_key_pair_t));
 	list_append(ret_list, key_pair);
-	key_pair->name = xstrdup("MaxMemPerCPU");
 	if (slurm_ctl_conf_ptr->max_mem_per_cpu & MEM_PER_CPU) {
+		key_pair->name = xstrdup("MaxMemPerCPU");
 		snprintf(tmp_str, sizeof(tmp_str), "%u",
 			 slurm_ctl_conf_ptr->max_mem_per_cpu & (~MEM_PER_CPU));
 		key_pair->value = xstrdup(tmp_str);
 
 	} else if (slurm_ctl_conf_ptr->max_mem_per_cpu) {
+		key_pair->name = xstrdup("MaxMemPerNode");
 		snprintf(tmp_str, sizeof(tmp_str), "%u",
 			 slurm_ctl_conf_ptr->max_mem_per_cpu);
 		key_pair->value = xstrdup(tmp_str);
 	} else {
+		key_pair->name = xstrdup("MaxMemPerNode");
 		key_pair->value = xstrdup("UNLIMITED");
 	}
 
diff --git a/src/slurmctld/read_config.c b/src/slurmctld/read_config.c
index bb8c04d7d5377115b52273abb963f600ca5cbd79..eff8c9ebf61fcf43abc8038ffb436e602ca1352e 100644
--- a/src/slurmctld/read_config.c
+++ b/src/slurmctld/read_config.c
@@ -996,6 +996,8 @@ static int _restore_node_state(int recover,
 		node_ptr->tmp_disk      = old_node_ptr->tmp_disk;
 		node_ptr->weight        = old_node_ptr->weight;
 
+		node_ptr->sus_job_cnt   = old_node_ptr->sus_job_cnt;
+
 		if (node_ptr->gres_list)
 			list_destroy(node_ptr->gres_list);
 		node_ptr->gres_list = old_node_ptr->gres_list;
@@ -1507,6 +1509,10 @@ static int _sync_nodes_to_active_job(struct job_record *job_ptr)
 					       node_flags;
 		}
 	}
+
+	if (IS_JOB_RUNNING(job_ptr) && job_ptr->front_end_ptr)
+		job_ptr->front_end_ptr->job_cnt_run++;
+
 	return cnt;
 }