diff --git a/src/include/switch_ivr.h b/src/include/switch_ivr.h
index 3e19a09c46..625084aaa4 100644
--- a/src/include/switch_ivr.h
+++ b/src/include/switch_ivr.h
@@ -106,6 +106,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(_In_ switch_core_session_
   \return SWITCH_STATUS_SUCCESS if successful
 */
 SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session);
+SWITCH_DECLARE(switch_status_t) switch_ivr_parse_next_event(switch_core_session_t *session);
 
 /*!
   \brief Wait for time to pass for a specified number of milliseconds
diff --git a/src/mod/endpoints/mod_sofia/mod_sofia.c b/src/mod/endpoints/mod_sofia/mod_sofia.c
index 4eac662e60..c3038a7beb 100644
--- a/src/mod/endpoints/mod_sofia/mod_sofia.c
+++ b/src/mod/endpoints/mod_sofia/mod_sofia.c
@@ -782,7 +782,6 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 			if (!tech_pvt->local_sdp_str) {
 				sofia_glue_tech_absorb_sdp(tech_pvt);
 			}
-			switch_channel_set_flag(tech_pvt->channel, CF_REQ_MEDIA);
 			sofia_glue_do_invite(session);
 		}
 		break;
@@ -828,7 +827,7 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
 			sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 1);
 
 			if (send_invite) {
-				switch_channel_set_flag(tech_pvt->channel, CF_REQ_MEDIA);
+				switch_channel_set_flag(channel, CF_REQ_MEDIA);
 				sofia_glue_do_invite(session);
 			}
 		}
diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 7f4df5929a..b012e6839e 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -399,15 +399,24 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_parse_event(switch_core_session_t *se
 	return status;
 }
 
-SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session)
+SWITCH_DECLARE(switch_status_t) switch_ivr_parse_next_event(switch_core_session_t *session)
 {
 	switch_event_t *event;
 
-	while (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) {
+	if (switch_core_session_dequeue_private_event(session, &event) == SWITCH_STATUS_SUCCESS) {
 		switch_ivr_parse_event(session, event);
 		switch_event_fire(&event);
+		return SWITCH_STATUS_SUCCESS;
 	}
 
+	return SWITCH_STATUS_FALSE;
+
+}
+
+SWITCH_DECLARE(switch_status_t) switch_ivr_parse_all_events(switch_core_session_t *session)
+{
+
+	while (switch_ivr_parse_next_event(session) == SWITCH_STATUS_SUCCESS);
 	return SWITCH_STATUS_SUCCESS;
 }
 
@@ -843,6 +852,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_media(const char *uuid, switch_media_
 			} else {
 				switch_ivr_uuid_bridge(uuid, other_uuid);
 			}
+			switch_channel_wait_for_flag(channel, CF_BRIDGED, SWITCH_TRUE, 1000);
+			switch_channel_wait_for_flag(other_channel, CF_BRIDGED, SWITCH_TRUE, 1000);
 		}
 	}
 
@@ -871,14 +882,12 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_medi
 
 		if ((flags & SMF_FORCE) || !switch_channel_test_flag(channel, CF_PROXY_MODE)) {
 			switch_core_session_receive_message(session, &msg);
-			switch_channel_wait_for_flag(channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000);
-
+			
 			if ((flags & SMF_REBRIDGE) && (other_uuid = switch_channel_get_variable(channel, SWITCH_BRIDGE_VARIABLE)) &&
 				(other_session = switch_core_session_locate(other_uuid))) {
 				other_channel = switch_core_session_get_channel(other_session);
 
 				switch_core_session_receive_message(other_session, &msg);
-				switch_channel_wait_for_flag(other_channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000);
 				switch_channel_clear_state_handler(other_channel, NULL);
 			}
 
@@ -889,6 +898,8 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_medi
 				} else {
 					switch_ivr_signal_bridge(session, other_session);
 				}
+				switch_channel_wait_for_flag(channel, CF_BRIDGED, SWITCH_TRUE, 1000);
+				switch_channel_wait_for_flag(other_channel, CF_BRIDGED, SWITCH_TRUE, 1000);
 				switch_core_session_rwunlock(other_session);
 			}
 		}
diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c
index 943fb87e0c..539e9552f9 100644
--- a/src/switch_ivr_bridge.c
+++ b/src/switch_ivr_bridge.c
@@ -153,7 +153,7 @@ static void *audio_bridge_thread(switch_thread_t * thread, void *obj)
 			msg.message_id = SWITCH_MESSAGE_INDICATE_UNBRIDGE;
 			msg.from = __FILE__;
 			switch_core_session_receive_message(session_a, &msg);
-			switch_ivr_parse_all_events(session_a);
+			switch_ivr_parse_next_event(session_a);
 			msg.message_id = SWITCH_MESSAGE_INDICATE_BRIDGE;
 			switch_core_session_receive_message(session_a, &msg);
 			switch_channel_clear_flag(chan_b, CF_SUSPEND);
diff --git a/src/switch_xml.cpp b/src/switch_xml.cpp
index 7990d83c46..c8d85950e8 100644
--- a/src/switch_xml.cpp
+++ b/src/switch_xml.cpp
@@ -1410,7 +1410,7 @@ SWITCH_DECLARE(switch_status_t) switch_xml_locate_user(const char *key,
 
 	if (user_name) {
 		
-		if (params && switch_event_get_header(params, "mailbox")) {
+		if (params && switch_event_get_header(params, (char *) "mailbox")) {
 			if ((*user = switch_xml_find_child(*domain, "user", "mailbox", user_name))) {
 				return SWITCH_STATUS_SUCCESS;
 			}