diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c
index 46c301c44..b942010c6 100644
--- a/coreapi/linphonecall.c
+++ b/coreapi/linphonecall.c
@@ -2395,7 +2395,7 @@ static int find_crypto_index_from_tag(const SalSrtpCryptoAlgo crypto[],unsigned
 	return -1;
 }
 
-static void configure_rtp_session_for_rtcp_fb(LinphoneCall *call, SalStreamDescription *stream) {
+static void configure_rtp_session_for_rtcp_fb(LinphoneCall *call, const SalStreamDescription *stream) {
 	RtpSession *session = NULL;
 
 	if (stream->type == SalAudio) {
diff --git a/oRTP b/oRTP
index 79e8c769e..7383e9725 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 79e8c769eebb7a60ba55f5bcada0aa200507d017
+Subproject commit 7383e9725b5861a7cb65f0be62d0eb0af7c2ede9
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 00a21444f..b0bb676c5 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -4402,7 +4402,6 @@ static void call_with_generic_nack_rtcp_feedback(void) {
 	LinphoneCall *call_marie;
 	bool_t call_ok;
 	OrtpNetworkSimulatorParams params = { 0 };
-	int dummy = 0;
 
 	params.enabled = TRUE;
 	params.loss_rate = 10;