diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index d2a5671354..4f4d55068c 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -10654,7 +10654,7 @@ quit_no_clean:
 /*
 * The following three functions (mwi_send_init, mwi_send_process_buffer,
 * mwi_send_process_event) work with the do_monitor thread to generate mwi spills
-* that are sent out via FXA port on voicemail state change.  The execution of
+* that are sent out via FXS port on voicemail state change.  The execution of
 * the mwi send is state driven and can either generate a ring pulse prior to
 * sending the fsk spill or simply send an fsk spill.
 */
diff --git a/channels/sig_analog.c b/channels/sig_analog.c
index 3214681bda..762169f87f 100644
--- a/channels/sig_analog.c
+++ b/channels/sig_analog.c
@@ -3512,6 +3512,7 @@ void *analog_handle_init_event(struct analog_pvt *i, int event)
 			break;
 		case ANALOG_SIG_FXOKS:
 			i->fxsoffhookstate = 0;
+			analog_start_polarityswitch(i);
 			analog_set_echocanceller(i, 0);
 			/* Diddle the battery for the zhone */
 #ifdef ZHONE_HACK