diff --git a/main/dsp.c b/main/dsp.c
index 7541650844..4272158ff5 100644
--- a/main/dsp.c
+++ b/main/dsp.c
@@ -312,7 +312,6 @@ static inline void goertzel_sample(goertzel_state_t *s, short sample)
 		s->chunky++;
 		s->v3 = s->v3 >> 1;
 		s->v2 = s->v2 >> 1;
-		v1 = v1 >> 1;
 	}
 }
 
@@ -502,7 +501,7 @@ static void ast_mf_detect_init (mf_detect_state_t *s, unsigned int sample_rate)
 	int i;
 	s->hits[0] = s->hits[1] = s->hits[2] = s->hits[3] = s->hits[4] = 0;
 	for (i = 0;  i < 6;  i++) {
-		goertzel_init (&s->tone_out[i], mf_tones[i], 160, sample_rate);
+		goertzel_init (&s->tone_out[i], mf_tones[i], MF_SIZE, sample_rate);
 	}
 	s->current_sample = 0;
 	s->current_hit = 0;
diff --git a/main/manager.c b/main/manager.c
index 4a50c0c72f..4b791c02f4 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -687,16 +687,23 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 				<para>Asterisk module name (including .so extension) or subsystem identifier:</para>
 				<enumlist>
 					<enum name="cdr" />
-					<enum name="enum" />
 					<enum name="dnsmgr" />
 					<enum name="extconfig" />
+					<enum name="enum" />
 					<enum name="manager" />
-					<enum name="rtp" />
 					<enum name="http" />
+					<enum name="logger" />
+					<enum name="features" />
+					<enum name="dsp" />
+					<enum name="udptl" />
+					<enum name="indications" />
+					<enum name="cel" />
+					<enum name="plc" />
 				</enumlist>
 			</parameter>
 			<parameter name="LoadType" required="true">
-				<para>The operation to be done on module.</para>
+				<para>The operation to be done on module. Subsystem identifiers may only
+				be reloaded.</para>
 				<enumlist>
 					<enum name="load" />
 					<enum name="unload" />
diff --git a/main/pbx.c b/main/pbx.c
index f4cfb70d4e..c3b09981fc 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7192,6 +7192,7 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
 			continue;	/* not the name we want */
 
 		dpc->context_existence = 1;
+		dpc->total_context++;
 
 		ast_debug(3, "manager_show_dialplan: Found Context: %s \n", ast_get_context_name(c));
 
@@ -7215,8 +7216,6 @@ static int manager_show_dialplan_helper(struct mansession *s, const struct messa
 
 			dpc->extension_existence = 1;
 
-			/* may we print context info? */
-			dpc->total_context++;
 			dpc->total_exten++;
 
 			p = NULL;		/* walk next extension peers */