diff --git a/src/plugins/jobacct/common/common_slurmctld.c b/src/plugins/jobacct/common/common_slurmctld.c
index 17b23c546330717870a392c504b51dc8b7f33f0a..23707be2ccd5b3caf084b9f0a0c7efd36d2d52b5 100644
--- a/src/plugins/jobacct/common/common_slurmctld.c
+++ b/src/plugins/jobacct/common/common_slurmctld.c
@@ -251,7 +251,6 @@ extern int common_step_start_slurmctld(struct step_record *step)
 #else
 	cpus = step->num_cpus;
 	snprintf(node_list, BUFFER_SIZE, "%s", step->step_node_list);
-	block_id = xstrdup("-");
 #endif
 	snprintf(buf, BUFFER_SIZE, _jobstep_format,
 		 JOB_STEP,
@@ -338,7 +337,6 @@ extern int common_step_complete_slurmctld(struct step_record *step)
 #else
 	cpus = step->num_cpus;
 	snprintf(node_list, BUFFER_SIZE, "%s", step->step_node_list);
-	block_id = xstrdup("-");
 #endif
 	
 	snprintf(buf, BUFFER_SIZE, _jobstep_format,
diff --git a/src/slurmctld/proc_req.c b/src/slurmctld/proc_req.c
index 72f02dae3674775259bd9c6ac00737b74f85712e..e4602943a341a9350bafc14c5205a8e665db4349 100644
--- a/src/slurmctld/proc_req.c
+++ b/src/slurmctld/proc_req.c
@@ -1558,8 +1558,9 @@ static void _slurm_rpc_shutdown_controller_immediate(slurm_msg_t * msg)
 		debug("Performing RPC: REQUEST_SHUTDOWN_IMMEDIATE");
 }
 
-/* _slurm_rpc_step_complete - process step completion RPC to note the completion of 
- *	a job step on at least some nodes. If the job step is complete, it may 
+/* _slurm_rpc_step_complete - process step completion RPC to note the 
+ *      completion of a job step on at least some nodes.
+ *	If the job step is complete, it may 
  *	represent the termination of an entire job */
 static void _slurm_rpc_step_complete(slurm_msg_t *msg)
 {
@@ -1604,7 +1605,7 @@ static void _slurm_rpc_step_complete(slurm_msg_t *msg)
 	if (req->job_step_id == SLURM_BATCH_SCRIPT) {
 		/* FIXME: test for error, possibly cause batch job requeue */
 		error_code = job_complete(req->job_id, uid, job_requeue, 
-				step_rc);
+					  step_rc);
 		unlock_slurmctld(job_write_lock);
 		END_TIMER;