diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c
index 86887c7b7..1975edb23 100644
--- a/coreapi/message_storage.c
+++ b/coreapi/message_storage.c
@@ -371,7 +371,7 @@ void linphone_message_storage_init_chat_rooms(LinphoneCore *lc) {
 }
 
 static void _linphone_message_storage_profile(void*data,const char*statement, sqlite3_uint64 duration){
-	ms_warning("SQL statement '%s' took %" PRId64 " microseconds", statement, duration / 1000 );
+	ms_warning("SQL statement '%s' took %llu microseconds", statement, (unsigned long long)duration / 1000LL );
 }
 
 static void linphone_message_storage_activate_debug(sqlite3* db, bool_t debug){
diff --git a/mediastreamer2 b/mediastreamer2
index f47343572..5db89bd64 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit f47343572409561009e38a241ef3fde113d596d7
+Subproject commit 5db89bd644eb5a692c4b570e06a199943ff6cb26
diff --git a/oRTP b/oRTP
index 2f3ce6970..a6c420eed 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit 2f3ce697093694165a31f024a3141cd89a95bc42
+Subproject commit a6c420eedd03c677f5560c3b37bf2b5684c6b0f9