diff --git a/Classes/ChatConversationView.m b/Classes/ChatConversationView.m
index 14c632256..f20e70eb2 100644
--- a/Classes/ChatConversationView.m
+++ b/Classes/ChatConversationView.m
@@ -343,7 +343,7 @@ static UICompositeViewDescription *compositeDescription = nil;
 		// pull up the composing frame and shrink the table view
 		newTableFrame.size.height -= newComposingFrame.size.height;
 		newComposingFrame.origin.y = keyboardFrame.origin.y - newComposingFrame.size.height;
-		bctbx_list_t *addresses = linphone_chat_room_get_composing_addresses(_chatRoom);
+		const bctbx_list_t *addresses = linphone_chat_room_get_composing_addresses(_chatRoom);
 		NSString *composingAddresses = @"";
 		if (bctbx_list_size(addresses) == 1) {
 			composingAddresses = [NSString stringWithUTF8String:linphone_address_get_username((LinphoneAddress *)addresses->data)];
diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj
index 8c7f18cb3..b26bc4dee 100755
--- a/linphone.xcodeproj/project.pbxproj
+++ b/linphone.xcodeproj/project.pbxproj
@@ -4714,7 +4714,7 @@
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "-DORTP_LOG_DOMAIN=\\\"ios\\\"";
+				OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				PROVISIONING_PROFILE = "0636A6EA-90EB-4D92-B707-19FC32F9A7CF";
 				SDKROOT = iphoneos;
@@ -4817,7 +4817,7 @@
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "-DORTP_LOG_DOMAIN=\\\"ios\\\"";
+				OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
@@ -4920,7 +4920,7 @@
 				HEADER_SEARCH_PATHS = "";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "-DORTP_LOG_DOMAIN=\\\"ios\\\"";
+				OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				PROVISIONING_PROFILE = "C7F794BC-6D48-41F2-B37D-E1B1B1A40901";
 				SDKROOT = iphoneos;
@@ -5025,7 +5025,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LIBRARY_SEARCH_PATHS = "";
 				ONLY_ACTIVE_ARCH = YES;
-				OTHER_CFLAGS = "-DORTP_LOG_DOMAIN=\\\"ios\\\"";
+				OTHER_CFLAGS = "-DBCTBX_LOG_DOMAIN=\\\"ios\\\"";
 				OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
 				PROVISIONING_PROFILE = "2AC0DC11-4546-47B6-8B8A-453CCA80903C";
 				SDKROOT = iphoneos;
diff --git a/submodules/bctoolbox b/submodules/bctoolbox
index 02caea7df..81867f1d8 160000
--- a/submodules/bctoolbox
+++ b/submodules/bctoolbox
@@ -1 +1 @@
-Subproject commit 02caea7df8381b0c5dadcfbfd39ff0b33a2577b7
+Subproject commit 81867f1d8c26a10db632f9d0c1a61afa14d58432
diff --git a/submodules/ortp b/submodules/ortp
index 3319a460d..e4883ff01 160000
--- a/submodules/ortp
+++ b/submodules/ortp
@@ -1 +1 @@
-Subproject commit 3319a460d5f55b343899c091cb15c395a4f3fea4
+Subproject commit e4883ff0108622e10046b818a268f141218fb221