diff --git a/doc/html/faq.shtml b/doc/html/faq.shtml
index 8f831a7244c28c6e8329d0cff9dc20e7ef60582a..fedf934eb5d154b3acd5b1c9c068d757321a471f 100644
--- a/doc/html/faq.shtml
+++ b/doc/html/faq.shtml
@@ -1093,9 +1093,14 @@ Create a resource reservation as described by SLURM's
 
 <p><a name="pam"><b>9. How can PAM be used to control a user's limits on
 or access to compute nodes?</b></a><br>
-First, enable SLURM's use of PAM by setting <i>UsePAM=1</i> in
+You will need to build and install Slurm including it's PAM module
+(a <i>slurm_pam</i> package is provided, the code is located in the
+<i>contribs/pam</i> directory).
+First, enable Slurm's use of PAM by setting <i>UsePAM=1</i> in
 <i>slurm.conf</i>.<br>
-Second, establish a PAM configuration file for slurm in <i>/etc/pam.d/slurm</i>.
+Second, establish PAM configuration file(s) for Slurm in <i>/etc/pam.conf</i>
+or the appropriate files in the <i>/etc/pam.d</i> directory (e.g.
+<i>/etc/pam.d/sshd</i> by adding the line "account required pam_slurm.so".
 A basic configuration you might use is:</p>
 <pre>
 account  required  pam_unix.so
@@ -1109,7 +1114,7 @@ For example, to set the locked memory limit to unlimited for all users:</p>
 *   hard   memlock   unlimited
 *   soft   memlock   unlimited
 </pre>
-<p>Finally, you need to disable SLURM's forwarding of the limits from the
+<p>Finally, you need to disable Slurm's forwarding of the limits from the
 session from which the <i>srun</i> initiating the job ran. By default
 all resource limits are propagated from that session. For example, adding
 the following line to <i>slurm.conf</i> will prevent the locked memory
@@ -1908,6 +1913,6 @@ in COMPLETE state.
 
 <p class="footer"><a href="#top">top</a></p>
 
-<p style="text-align:center;">Last modified 3 October 2013</p>
+<p style="text-align:center;">Last modified 14 November 2013</p>
 
 <!--#include virtual="footer.txt"-->
diff --git a/src/slurmctld/reservation.c b/src/slurmctld/reservation.c
index f69aaba5dded11ffaebd972bc4b21a327f9a5c5e..b9635b6c62d57c3b3b76f6eb1578906f8f82479e 100644
--- a/src/slurmctld/reservation.c
+++ b/src/slurmctld/reservation.c
@@ -3259,7 +3259,8 @@ static bitstr_t *_pick_idle_node_cnt(bitstr_t *avail_bitmap,
 {
 	ListIterator job_iterator;
 	struct job_record *job_ptr;
-	bitstr_t *orig_bitmap, *save_bitmap = NULL, *ret_bitmap, *tmp_bitmap;
+	bitstr_t *orig_bitmap, *save_bitmap = NULL;
+	bitstr_t *ret_bitmap = NULL, *tmp_bitmap;
 	int total_node_cnt;
 
 	total_node_cnt = bit_set_count(avail_bitmap);