diff --git a/coreapi/bellesip_sal/sal_op_call.c b/coreapi/bellesip_sal/sal_op_call.c
index 6f886d336..1b0f63949 100644
--- a/coreapi/bellesip_sal/sal_op_call.c
+++ b/coreapi/bellesip_sal/sal_op_call.c
@@ -597,7 +597,7 @@ int sal_call_set_local_media_description(SalOp *op, SalMediaDescription *desc){
 
 static belle_sip_header_allow_t *create_allow(){
 	belle_sip_header_allow_t* header_allow;
-	header_allow = belle_sip_header_allow_create("INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO");
+	header_allow = belle_sip_header_allow_create("INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO, UPDATE");
 	return header_allow;
 }
 
@@ -609,8 +609,8 @@ static void sal_op_fill_invite(SalOp *op, belle_sip_request_t* invite) {
 		belle_sip_message_add_header(BELLE_SIP_MESSAGE(invite),belle_sip_header_create( "Supported", "timer"));
 	}
 	if (op->base.local_media){
-			op->sdp_offering=TRUE;
-			set_sdp_from_desc(BELLE_SIP_MESSAGE(invite),op->base.local_media);
+		op->sdp_offering=TRUE;
+		set_sdp_from_desc(BELLE_SIP_MESSAGE(invite),op->base.local_media);
 	}else op->sdp_offering=FALSE;
 	return;
 }
diff --git a/coreapi/misc.c b/coreapi/misc.c
index f46ec403b..82f089152 100644
--- a/coreapi/misc.c
+++ b/coreapi/misc.c
@@ -115,6 +115,7 @@ void linphone_core_set_payload_type_bitrate(LinphoneCore *lc, PayloadType *pt, i
 			pt->flags|=PAYLOAD_TYPE_BITRATE_OVERRIDE;
 		}else{
 			ms_error("Cannot set an explicit bitrate for codec %s/%i, because it is not VBR.",pt->mime_type,pt->clock_rate);
+			return;
 		}
 	}
 	ms_error("linphone_core_set_payload_type_bitrate() payload type not in audio or video list !");
diff --git a/oRTP b/oRTP
index bc9f28bea..fb53b3dd2 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit bc9f28beadf9336552eaa091c06bf72fd1d5e491
+Subproject commit fb53b3dd2bcc5e889f7026bdd42b151ef7217249