diff --git a/src/common/slurm_protocol_defs.h b/src/common/slurm_protocol_defs.h
index 28357539fd1a918f37527aef76b31e7a76f6d01b..507e70a959375feb698d2ca47b493f253aa2ae73 100644
--- a/src/common/slurm_protocol_defs.h
+++ b/src/common/slurm_protocol_defs.h
@@ -390,7 +390,7 @@ typedef struct last_update_msg {
 } last_update_msg_t;
 
 typedef struct set_debug_level_msg {
-	int32_t debug_level;
+	uint32_t debug_level;
 } set_debug_level_msg_t;
 
 typedef struct job_step_specs {
diff --git a/src/plugins/jobacct_storage/filetxt/jobacct_storage_filetxt.c b/src/plugins/jobacct_storage/filetxt/jobacct_storage_filetxt.c
index 88db3722971dabc06b17652abdb1ac6983c9de1f..7300027d4bc49e43d3c22ef3dd84da0bf8430bf3 100644
--- a/src/plugins/jobacct_storage/filetxt/jobacct_storage_filetxt.c
+++ b/src/plugins/jobacct_storage/filetxt/jobacct_storage_filetxt.c
@@ -277,7 +277,6 @@ extern int jobacct_storage_p_fini()
 extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 {
 	int	i,
-		ncpus=0,
 		rc=SLURM_SUCCESS,
 		tmp;
 	char	buf[BUFFER_SIZE], *jname, *account, *nodes;
@@ -290,9 +289,6 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 	}
 
 	debug2("jobacct_job_start() called");
-	for (i=0; i < job_ptr->num_cpu_groups; i++)
-		ncpus += (job_ptr->cpus_per_node[i])
-			* (job_ptr->cpu_count_reps[i]);
 	priority = (job_ptr->priority == NO_VAL) ?
 		-1L : (long) job_ptr->priority;
 
@@ -327,7 +323,7 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 	tmp = snprintf(buf, BUFFER_SIZE,
 		       "%d %s %d %ld %u %s %s",
 		       JOB_START, jname,
-		       track_steps, priority, job_ptr->num_procs,
+		       track_steps, priority, job_ptr->details->total_procs,
 		       nodes, account);
 
 	rc = _print_record(job_ptr, job_ptr->start_time, buf);
@@ -397,7 +393,7 @@ extern int jobacct_storage_p_step_start(struct step_record *step_ptr)
 	
 #else
 	if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
-		cpus = step_ptr->job_ptr->num_procs;
+		cpus = step_ptr->job_ptr->details->total_procs;
 		snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->job_ptr->nodes);
 	} else {
 		cpus = step_ptr->step_layout->task_cnt;
@@ -513,7 +509,7 @@ extern int jobacct_storage_p_step_complete(struct step_record *step_ptr)
 	
 #else
 	if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
-		cpus = step_ptr->job_ptr->num_procs;
+		cpus = step_ptr->job_ptr->details->total_procs;
 		snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->job_ptr->nodes);
 	
 	} else {
diff --git a/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c b/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c
index 0546aa347cef453cded81a1a9bcd1ebd57caafea..e0b4c9f0b1741ac4b0b5ad730e320a50866c0b88 100644
--- a/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c
+++ b/src/plugins/jobacct_storage/mysql/jobacct_storage_mysql.c
@@ -312,8 +312,7 @@ extern int jobacct_storage_p_fini()
 extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 {
 #ifdef HAVE_MYSQL
-		int	i,
-		ncpus=0,
+	int	i,
 		rc=SLURM_SUCCESS;
 	char	*jname, *account, *nodes;
 	long	priority;
@@ -332,9 +331,6 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 	}
 
 	debug2("mysql_jobacct_job_start() called");
-	for (i=0; i < job_ptr->num_cpu_groups; i++)
-		ncpus += (job_ptr->cpus_per_node[i])
-			* (job_ptr->cpu_count_reps[i]);
 	priority = (job_ptr->priority == NO_VAL) ?
 		-1L : (long) job_ptr->priority;
 
@@ -386,7 +382,7 @@ try_again:
 			 (int)job_ptr->start_time,
 			 jname, track_steps,
 			 job_ptr->job_state & (~JOB_COMPLETING),
-			 priority, job_ptr->num_procs,
+			 priority, job_ptr->details->total_procs,
 			 nodes, account);
 		rc = mysql_db_query(jobacct_mysql_db, query);
 	} else if(!reinit) {
@@ -499,7 +495,7 @@ extern int jobacct_storage_p_step_start(struct step_record *step_ptr)
 	
 #else
 	if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
-		cpus = step_ptr->job_ptr->num_procs;
+		cpus = step_ptr->job_ptr->details->total_procs;
 		snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->job_ptr->nodes);
 	} else {
 		cpus = step_ptr->step_layout->task_cnt;
@@ -577,7 +573,7 @@ extern int jobacct_storage_p_step_complete(struct step_record *step_ptr)
 	
 #else
 	if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
-		cpus = step_ptr->job_ptr->num_procs;
+		cpus = step_ptr->job_ptr->details->total_procs;
 	else 
 		cpus = step_ptr->step_layout->task_cnt;
 #endif
diff --git a/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c b/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c
index 593ca0396f8e8a7a7418cb2d1f48ba8dea8eeefd..e501e2dcdfb092b85c6f3b9fe6270a6cf6ac6c51 100644
--- a/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c
+++ b/src/plugins/jobacct_storage/pgsql/jobacct_storage_pgsql.c
@@ -372,7 +372,6 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 {
 #ifdef HAVE_PGSQL
 	int	i,
-		ncpus=0,
 		rc=SLURM_SUCCESS;
 	char	*jname, *account, *nodes;
 	long	priority;
@@ -391,9 +390,6 @@ extern int jobacct_storage_p_job_start(struct job_record *job_ptr)
 	}
 
 	debug2("pgsql_jobacct_job_start() called");
-	for (i=0; i < job_ptr->num_cpu_groups; i++)
-		ncpus += (job_ptr->cpus_per_node[i])
-			* (job_ptr->cpu_count_reps[i]);
 	priority = (job_ptr->priority == NO_VAL) ?
 		-1L : (long) job_ptr->priority;
 
@@ -446,7 +442,7 @@ try_again:
 			 (int)job_ptr->start_time,
 			 jname, track_steps,
 			 job_ptr->job_state & (~JOB_COMPLETING),
-			 priority, job_ptr->num_procs,
+			 priority, job_ptr->details->total_procs,
 			 nodes, account);
 		rc = pgsql_db_query(jobacct_pgsql_db, query);
 	} else if(!reinit) {
@@ -559,7 +555,7 @@ extern int jobacct_storage_p_step_start(struct step_record *step_ptr)
 	
 #else
 	if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt) {
-		cpus = step_ptr->job_ptr->num_procs;
+		cpus = step_ptr->job_ptr->details->total_procs;
 		snprintf(node_list, BUFFER_SIZE, "%s", step_ptr->job_ptr->nodes);
 	} else {
 		cpus = step_ptr->step_layout->task_cnt;
@@ -637,7 +633,7 @@ extern int jobacct_storage_p_step_complete(struct step_record *step_ptr)
 	
 #else
 	if(!step_ptr->step_layout || !step_ptr->step_layout->task_cnt)
-		cpus = step_ptr->job_ptr->num_procs;
+		cpus = step_ptr->job_ptr->details->total_procs;
 	else 
 		cpus = step_ptr->step_layout->task_cnt;
 #endif
diff --git a/src/slurmctld/node_scheduler.c b/src/slurmctld/node_scheduler.c
index 3a420fb94bfc7863da0acc792787c2348fba96b0..b2e4fbfdae57eb250d1c796078c7234768a7e51f 100644
--- a/src/slurmctld/node_scheduler.c
+++ b/src/slurmctld/node_scheduler.c
@@ -329,6 +329,7 @@ _pick_best_load(struct job_record *job_ptr, bitstr_t * bitmap,
 	FREE_NULL_BITMAP(basemap);
 	return error_code;
 }
+#endif
 
 /*
  * Set the bits in 'jobmap' that correspond to bits in the 'bitmap'
@@ -351,7 +352,6 @@ _job_count_bitmap(bitstr_t * bitmap, bitstr_t * jobmap, int job_cnt)
 	}
 	return count;
 }
-#endif
 
 /*
  * Decide if a job can share nodes with other jobs based on the