diff --git a/doc/html/programmer_guide.shtml b/doc/html/programmer_guide.shtml
index 0efe7661bab2a3b3a69efc55c6c854a879df48b7..cad82a205a6f376098cee90064f9050ee12f84f0 100644
--- a/doc/html/programmer_guide.shtml
+++ b/doc/html/programmer_guide.shtml
@@ -183,11 +183,11 @@ many switch plugins will not work, srun reattachs won't work, etc.).</p>
 
 <p>Multiple support is enabled at configure-time with the
 "--enable-multiple-slurmd" parameter.  This enables a new parameter in the
-slurm.conf file on the NodeName line, "Port=<port number>", and adds two new command
-line parameters to slurmd, "-N" and "-P".</p>
+slurm.conf file on the NodeName line, "Port=<port number>", and adds a new
+command line parameters to slurmd, "-N" and "-P".</p>
 
-<p>Each slurmd needs to have its own NodeName, and its own TCP port number. Here is
-an example of the NodeName lines for running three slurmd daemons on each
+<p>Each slurmd needs to have its own NodeName, and its own TCP port number. Here
+is an example of the NodeName lines for running three slurmd daemons on each
 of ten nodes:</p>
 
 <pre>
@@ -197,14 +197,14 @@ NodeName=foo[21-30] NodeAddr=host[1-10] Port=17003
 </pre>
 
 <p>
-It is then up to you to start the slurmd daemons with the proper NodeName and
-Port values.  For example, to start the slurmd daemons for host1 from the
+It is then up to you to start the slurmd daemons with the proper NodeNames.
+For example, to start the slurmd daemons for host1 from the
 above slurm.conf example:</p>
 
 <pre>
-host1> slurmd -N foo1 -P 17001
-host1> slurmd -N foo11 -P 17002
-host1> slurmd -N foo21 -P 17003
+host1> slurmd -N foo1
+host1> slurmd -N foo11
+host1> slurmd -N foo21
 </pre>
 
 <p class="footer"><a href="#top">top</a></p>
diff --git a/src/api/job_info.c b/src/api/job_info.c
index 426454d2ceb7b70f354a0daba48da493b8520054..63815d3596bd5093d4b6494dd2e1d434a384a51c 100644
--- a/src/api/job_info.c
+++ b/src/api/job_info.c
@@ -351,6 +351,9 @@ slurm_pid2jobid (pid_t job_pid, uint32_t *jobid)
 	job_id_request_msg_t req;
 	List ret_list;
 
+	memset(&req_msg, 0, sizeof(slurm_msg_t));
+	memset(&resp_msg, 0, sizeof(slurm_msg_t));
+
 	/*
 	 *  Set request message address to slurmd on localhost
 	 */
diff --git a/src/api/step_launch.c b/src/api/step_launch.c
index 9b6306ad2e4113164ad8510fc469e42a5b983d10..8da80f711e39fab2b6f2d5e8c61fc88bae63c867 100644
--- a/src/api/step_launch.c
+++ b/src/api/step_launch.c
@@ -71,8 +71,8 @@ static int _launch_tasks(slurm_step_ctx ctx,
 static client_io_t *_setup_step_client_io(slurm_step_ctx ctx,
 					  slurm_step_io_fds_t fds,
 					  bool labelio);
-static int _get_step_addresses(const slurm_step_ctx ctx,
-			       slurm_addr **address, int *num_addresses);
+/* static int _get_step_addresses(const slurm_step_ctx ctx, */
+/* 			       slurm_addr **address, int *num_addresses); */
 
 /**********************************************************************
  * Message handler declarations
@@ -240,6 +240,7 @@ int slurm_step_launch_wait_start(slurm_step_ctx ctx)
 		pthread_cond_wait(&sls->cond, &sls->lock);
 	}
 	pthread_mutex_unlock(&sls->lock);
+	return 1;
 }
 
 /*
@@ -615,6 +616,7 @@ static client_io_t *_setup_step_client_io(slurm_step_ctx ctx,
 	return client_io;
 }
 
+#if 0
 /*
  * Given a step context, return an array of the addresses of all nodes
  * in the job step.
@@ -670,3 +672,4 @@ _get_step_addresses(const slurm_step_ctx ctx,
 	*num_addresses = num_nodes;
 	return 0;
 }
+#endif
diff --git a/src/slaunch/slaunch.c b/src/slaunch/slaunch.c
index 06e361d1a52f89c0f5a70b5e6333405ccd3e1726..46d4d95824ca151bf2dbbafd7957daa0233c53e2 100644
--- a/src/slaunch/slaunch.c
+++ b/src/slaunch/slaunch.c
@@ -320,6 +320,7 @@ static int _set_rlimit_env(void)
 	return rc;
 }
 
+#if 0
 static int _become_user (uid_t uid, gid_t gid)
 {
 	struct passwd *pwd = getpwuid (opt.uid);
@@ -405,6 +406,7 @@ static int _run_srun_script (char *script)
 
 	/* NOTREACHED */
 }
+#endif
 
 static void
 _setup_local_fds(slurm_step_io_fds_t *cio_fds, int jobid, int stepid,