diff --git a/src/mod/endpoints/mod_skinny/mod_skinny.c b/src/mod/endpoints/mod_skinny/mod_skinny.c
index defbf915f9..d37c728cb9 100644
--- a/src/mod/endpoints/mod_skinny/mod_skinny.c
+++ b/src/mod/endpoints/mod_skinny/mod_skinny.c
@@ -802,7 +802,10 @@ int channel_on_hangup_callback(void *pArg, int argc, char **argv, char **columnN
 		send_select_soft_keys(listener, line_instance, call_id, SKINNY_KEY_SET_ON_HOOK, 0xffff);
 		send_define_current_time_date(listener);
 		if((call_state == SKINNY_PROCEED) || (call_state == SKINNY_RING_OUT) || (call_state == SKINNY_CONNECTED)) { /* calling parties */
-			send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
+			// This is NOT correct, but results in slightly better behavior than before
+			// leaving note here to revisit.
+
+			//send_set_speaker_mode(listener, SKINNY_SPEAKER_OFF);
 		}
 		send_set_ringer(listener, SKINNY_RING_OFF, SKINNY_RING_FOREVER, 0, call_id);
 	}
diff --git a/src/mod/endpoints/mod_skinny/skinny_labels.h b/src/mod/endpoints/mod_skinny/skinny_labels.h
index 3e495c1bd5..6d2aae6c74 100644
--- a/src/mod/endpoints/mod_skinny/skinny_labels.h
+++ b/src/mod/endpoints/mod_skinny/skinny_labels.h
@@ -46,7 +46,7 @@
 #define SKINNY_DISP_RESUME                                		"\200\12"
 #define SKINNY_DISP_ANSWER                                		"\200\13"
 #define SKINNY_DISP_INFO                                  		"\200\14"
-#define SKINNY_DISP_CONFRM                                		"\200\15"
+#define SKINNY_DISP_CONF                                		"\200\15"
 #define SKINNY_DISP_PARK                                  		"\200\16"
 #define SKINNY_DISP_JOIN                                  		"\200\17"
 #define SKINNY_DISP_MEETME                                		"\200\20"
diff --git a/src/mod/endpoints/mod_skinny/skinny_server.c b/src/mod/endpoints/mod_skinny/skinny_server.c
index 52252fab0d..0a661b2022 100644
--- a/src/mod/endpoints/mod_skinny/skinny_server.c
+++ b/src/mod/endpoints/mod_skinny/skinny_server.c
@@ -49,10 +49,10 @@ struct soft_key_template_definition soft_key_template_default[] = {
 	{ SKINNY_DISP_RESUME, SOFTKEY_RESUME },
 	{ SKINNY_DISP_ANSWER, SOFTKEY_ANSWER },
 	{ SKINNY_DISP_INFO, SOFTKEY_INFO },
-	{ SKINNY_DISP_CONFRM, SOFTKEY_CONFRM },
+	{ SKINNY_DISP_CONF, SOFTKEY_CONF },
 	{ SKINNY_DISP_PARK, SOFTKEY_PARK },
 	{ SKINNY_DISP_JOIN, SOFTKEY_JOIN },
-	{ SKINNY_DISP_MEETME, SOFTKEY_MEETMECONFRM },
+	{ SKINNY_DISP_MEETME, SOFTKEY_MEETMECONF },
 	{ SKINNY_DISP_CALLPICKUP, SOFTKEY_CALLPICKUP },
 	{ SKINNY_DISP_GRPCALLPICKUP, SOFTKEY_GRPCALLPICKUP },
 	{ SKINNY_DISP_DND, SOFTKEY_DND },
diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.c b/src/mod/endpoints/mod_skinny/skinny_tables.c
index f5ce877f27..d07366cc1c 100644
--- a/src/mod/endpoints/mod_skinny/skinny_tables.c
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.c
@@ -179,10 +179,10 @@ SKINNY_DECLARE_STR2ID(skinny_str2button, SKINNY_BUTTONS, -1)
 		{SOFTKEY_RESUME, "SoftkeyResume"},
 		{SOFTKEY_ANSWER , "SoftkeyAnswer"},
 		{SOFTKEY_INFO, "SoftkeyInfo"},
-		{SOFTKEY_CONFRM, "SoftkeyConfrm"},
+		{SOFTKEY_CONF, "SoftkeyConf"},
 		{SOFTKEY_PARK, "SoftkeyPark"},
 		{SOFTKEY_JOIN, "SoftkeyJoin"},
-		{SOFTKEY_MEETMECONFRM, "SoftkeyMeetmeconfrm"},
+		{SOFTKEY_MEETMECONF, "SoftkeyMeetmeconfrm"},
 		{SOFTKEY_CALLPICKUP, "SoftkeyCallpickup"},
 		{SOFTKEY_GRPCALLPICKUP, "SoftkeyGrpcallpickup"},
 		{SOFTKEY_DND, "SoftkeyDnd"},
diff --git a/src/mod/endpoints/mod_skinny/skinny_tables.h b/src/mod/endpoints/mod_skinny/skinny_tables.h
index 502c0b5eb6..e7fc4a9b7b 100644
--- a/src/mod/endpoints/mod_skinny/skinny_tables.h
+++ b/src/mod/endpoints/mod_skinny/skinny_tables.h
@@ -185,10 +185,10 @@ enum skinny_soft_key_event {
 	SOFTKEY_RESUME = 0x0A,
 	SOFTKEY_ANSWER = 0x0B,
 	SOFTKEY_INFO = 0x0C,
-	SOFTKEY_CONFRM = 0x0D,
+	SOFTKEY_CONF = 0x0D,
 	SOFTKEY_PARK = 0x0E,
 	SOFTKEY_JOIN = 0x0F,
-	SOFTKEY_MEETMECONFRM = 0x10,
+	SOFTKEY_MEETMECONF = 0x10,
 	SOFTKEY_CALLPICKUP = 0x11,
 	SOFTKEY_GRPCALLPICKUP = 0x12,
 	SOFTKEY_DND = 0x13,
diff --git a/src/mod/event_handlers/mod_rayo/mod_rayo.h b/src/mod/event_handlers/mod_rayo/mod_rayo.h
index fb197ef915..ec50b78b69 100644
--- a/src/mod/event_handlers/mod_rayo/mod_rayo.h
+++ b/src/mod/event_handlers/mod_rayo/mod_rayo.h
@@ -45,7 +45,6 @@
 
 /* these are support punchblock.. undefine once punchblock is fixed */
 #define RAYO_UUID_IN_REF_URI
-#define RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE
 
 struct rayo_actor;
 struct rayo_call;
diff --git a/src/mod/event_handlers/mod_rayo/rayo_input_component.c b/src/mod/event_handlers/mod_rayo/rayo_input_component.c
index acf2ce4a2f..16e3859ed6 100644
--- a/src/mod/event_handlers/mod_rayo/rayo_input_component.c
+++ b/src/mod/event_handlers/mod_rayo/rayo_input_component.c
@@ -169,15 +169,11 @@ static int digit_mask_set_from_digits(int digit_mask, const char *digits)
  */
 static void send_match_event(struct rayo_component *component, iks *result)
 {
-#ifdef RAYO_INPUT_COMPLETE_WITHOUT_CONTENT_TYPE
-	rayo_component_send_complete_with_metadata(RAYO_COMPONENT(component), INPUT_MATCH, result, 0);
-#else
 	iks *event = rayo_component_create_complete_event(RAYO_COMPONENT(component), INPUT_MATCH);
 	iks *match = iks_find(iks_find(event, "complete"), INPUT_MATCH_TAG);
 	iks_insert_attrib(match, "content-type", "application/nlsml+xml");
 	iks_insert_cdata(match, iks_string(iks_stack(result), result), 0);
 	rayo_component_send_complete_event(component, event);
-#endif
 }
 
 /**
diff --git a/src/switch_ivr_async.c b/src/switch_ivr_async.c
index 540ddb9c07..dc3346c305 100644
--- a/src/switch_ivr_async.c
+++ b/src/switch_ivr_async.c
@@ -1070,7 +1070,7 @@ static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, s
 	struct record_helper *rh = (struct record_helper *) user_data;
 	switch_event_t *event;
 	switch_frame_t *nframe;
-	switch_size_t len;
+	switch_size_t len = 0;
 	int mask = switch_core_media_bug_test_flag(bug, SMBF_MASK);
 	unsigned char null_data[SWITCH_RECOMMENDED_BUFFER_SIZE] = {0};
 
diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index cb3d3b4695..2790402f85 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -697,7 +697,7 @@ static switch_status_t ice_out(switch_rtp_t *rtp_session, switch_rtp_ice_t *ice)
 		if (elapsed > 30000) {
 			
 			switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(rtp_session->session), SWITCH_LOG_ERROR, "No stun for a long time (PUNT!)\n");
-			status = SWITCH_STATUS_FALSE;
+			status = SWITCH_STATUS_GENERR;
 			goto end;
 		}
 	}
@@ -1569,7 +1569,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
 	}
 	
 	if (rtp_session->ice.ice_user) {
-		if (ice_out(rtp_session, &rtp_session->ice) != SWITCH_STATUS_SUCCESS) {
+		if (ice_out(rtp_session, &rtp_session->ice) == SWITCH_STATUS_GENERR) {
 			ret = -1;
 			goto end;
 		}
@@ -1577,7 +1577,7 @@ static int check_rtcp_and_ice(switch_rtp_t *rtp_session)
 
 	if (!rtp_session->flags[SWITCH_RTP_FLAG_RTCP_MUX]) {
 		if (rtp_session->rtcp_ice.ice_user) {
-			if (ice_out(rtp_session, &rtp_session->rtcp_ice) != SWITCH_STATUS_SUCCESS) {
+			if (ice_out(rtp_session, &rtp_session->rtcp_ice) == SWITCH_STATUS_GENERR) {
 				ret = -1;
 				goto end;
 			}
@@ -3830,7 +3830,9 @@ static switch_status_t read_rtp_packet(switch_rtp_t *rtp_session, switch_size_t
 
 	status = switch_socket_recvfrom(rtp_session->from_addr, rtp_session->sock_input, 0, (void *) &rtp_session->recv_msg, bytes);
 
-	check_rtcp_and_ice(rtp_session);
+	if (check_rtcp_and_ice(rtp_session) == -1) {
+		return SWITCH_STATUS_GENERR;
+	}
 	
 	if (rtp_session->flags[SWITCH_RTP_FLAG_UDPTL]) {
 		goto udptl;
@@ -4524,7 +4526,10 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 			}
 
 			if (rtp_session->flags[SWITCH_RTP_FLAG_VIDEO]) {				
-				check_rtcp_and_ice(rtp_session);
+				if (check_rtcp_and_ice(rtp_session) == -1) {
+					ret = -1;
+					goto end;
+				}
 
 			} else if ((!(io_flags & SWITCH_IO_FLAG_NOBLOCK)) && 
 					   (rtp_session->dtmf_data.out_digit_dur == 0)) {