diff --git a/src/slurmctld/step_mgr.c b/src/slurmctld/step_mgr.c
index 94fb4d2946272f3a127f98fe03c7283657208f9d..c980cae9ca2cb101665c384475ea4b1d379ec1cc 100644
--- a/src/slurmctld/step_mgr.c
+++ b/src/slurmctld/step_mgr.c
@@ -1834,12 +1834,9 @@ static void _pack_ctld_job_step_info(struct step_record *step_ptr, Buf buffer)
 	time_t begin_time, run_time;
 	bitstr_t *pack_bitstr;
 #ifdef HAVE_FRONT_END
-	/* On front end systems the steps are only
-	 * given the first node to run off of
-	 * so we need to make them appear like
-	 * they are running on the entire
-	 * space (which they really are).
-	 */
+	/* On front-end systems, the steps only execute on one node.
+	 * We need to make them appear like they are running on the job's
+	 * entire allocation (which they really are). */
 	task_cnt = step_ptr->job_ptr->cpu_cnt;
 	node_list = step_ptr->job_ptr->nodes;
 	pack_bitstr = step_ptr->job_ptr->node_bitmap;
@@ -1849,7 +1846,7 @@ static void _pack_ctld_job_step_info(struct step_record *step_ptr, Buf buffer)
 		task_cnt = step_ptr->step_layout->task_cnt;
 		node_list = step_ptr->step_layout->node_list;
 	} else {
-		if(step_ptr->job_ptr->details)
+		if (step_ptr->job_ptr->details)
 			task_cnt = step_ptr->job_ptr->details->min_cpus;
 		else
 			task_cnt = step_ptr->job_ptr->cpu_cnt;
diff --git a/src/slurmd/slurmstepd/mgr.c b/src/slurmd/slurmstepd/mgr.c
index 8d56769682ac9dcb37b42ac871fcfa9412b8eba1..74ec35e8f87c1b151e6af646e0c1cbb5eb8d142e 100644
--- a/src/slurmd/slurmstepd/mgr.c
+++ b/src/slurmd/slurmstepd/mgr.c
@@ -1630,14 +1630,15 @@ _send_launch_failure (launch_tasks_request_msg_t *msg, slurm_addr_t *cli, int rc
 {
 	slurm_msg_t resp_msg;
 	launch_tasks_response_msg_t resp;
-	int nodeid = 0;
+	int nodeid;
 	char *name = NULL;
+
 #ifndef HAVE_FRONT_END
 	nodeid = nodelist_find(msg->complete_nodelist, conf->node_name);
 	name = xstrdup(conf->node_name);
 #else
+	nodeid = 0;
 	name = xstrdup(msg->complete_nodelist);
-
 #endif
 	debug ("sending launch failure message: %s", slurm_strerror (rc));