diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 3b2054aeb..31b945acb 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -551,14 +551,14 @@ LinphoneCall * linphone_call_new_incoming(LinphoneCore *lc, LinphoneAddress *fro
 			break;
 		case LinphonePolicyUseUpnp:
 #ifdef BUILD_UPNP
-		call->upnp_session = linphone_upnp_session_new(call);
-		if (call->upnp_session != NULL) {
-			linphone_call_init_media_streams(call);
-			if (linphone_core_update_upnp_from_remote_media_description(call, sal_call_get_remote_media_description(op))<0) {
-				/* uPnP port mappings failed, proceed with the call anyway. */
-				linphone_call_delete_upnp_session(call);
+			call->upnp_session = linphone_upnp_session_new(call);
+			if (call->upnp_session != NULL) {
+				linphone_call_init_media_streams(call);
+				if (linphone_core_update_upnp_from_remote_media_description(call, sal_call_get_remote_media_description(op))<0) {
+					/* uPnP port mappings failed, proceed with the call anyway. */
+					linphone_call_delete_upnp_session(call);
+				}
 			}
-		}
 #endif //BUILD_UPNP
 			break;
 		default:
diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c
index 4c5822590..0db4090ca 100644
--- a/coreapi/linphonecore.c
+++ b/coreapi/linphonecore.c
@@ -2082,7 +2082,7 @@ void linphone_core_iterate(LinphoneCore *lc){
 		 linphone_core_start_invite() */
 		calls=calls->next;
 		linphone_call_background_tasks(call,one_second_elapsed);
-		if (call->state==LinphoneCallOutgoingInit && (curtime-call->start_time>=2)){
+		if (call->state==LinphoneCallOutgoingInit && (elapsed>=4)){
 			/*start the call even if the OPTIONS reply did not arrive*/
 			if (call->ice_session != NULL) {
 				ms_warning("ICE candidates gathering from [%s] has not finished yet, proceed with the call without ICE anyway."
@@ -2365,6 +2365,8 @@ int linphone_core_proceed_with_invite_if_ready(LinphoneCore *lc, LinphoneCall *c
 	} else {
 		upnp_ready = TRUE;
 	}
+#else
+	upnp_ready=TRUE;
 #endif //BUILD_UPNP
 	if (call->ping_op != NULL) {
 		if (call->ping_replied == TRUE) ping_ready = TRUE;
diff --git a/mediastreamer2 b/mediastreamer2
index 6251dea54..13d3df5a9 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 6251dea54272cf048c580e03a80c67d672367f2a
+Subproject commit 13d3df5a9333ce465214ede7afc9a535a43c9076