diff --git a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
index a3fe3a63f..1447454de 100644
--- a/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/file_utilities_mac.mm
@@ -514,7 +514,7 @@ bool UnsafeShowOpenWith(const QString &filepath) {
 		NSArray *appsPaths = [[NSFileManager defaultManager] URLsForDirectory:NSApplicationDirectory inDomains:NSLocalDomainMask];
 		if ([appsPaths count]) [openPanel setDirectoryURL:[appsPaths firstObject]];
 		[openPanel beginWithCompletionHandler:^(NSInteger result){
-			if (result == NSFileHandlingPanelOKButton) {
+			if (result == NSModalResponseOK) {
 				if ([[openPanel URLs] count] > 0) {
 					NSURL *app = [[openPanel URLs] objectAtIndex:0];
 					NSString *path = [app path];
diff --git a/Telegram/cmake/lib_tgcalls.cmake b/Telegram/cmake/lib_tgcalls.cmake
index 8d730b142..17e189270 100644
--- a/Telegram/cmake/lib_tgcalls.cmake
+++ b/Telegram/cmake/lib_tgcalls.cmake
@@ -250,6 +250,7 @@ PRIVATE
     -Wno-deprecated-volatile
     -Wno-ambiguous-reversed-operator
     -Wno-deprecated-declarations
+    -Wno-unqualified-std-cast-call
 )
 
 remove_target_sources(lib_tgcalls ${tgcalls_loc}
diff --git a/Telegram/cmake/lib_tgvoip.cmake b/Telegram/cmake/lib_tgvoip.cmake
index 76796304a..886cd9935 100644
--- a/Telegram/cmake/lib_tgvoip.cmake
+++ b/Telegram/cmake/lib_tgvoip.cmake
@@ -25,13 +25,6 @@ init_target(lib_tgvoip_bundled)
 cmake_dependent_option(LIBTGVOIP_DISABLE_ALSA "Disable libtgvoip's ALSA backend." OFF LINUX ON)
 cmake_dependent_option(LIBTGVOIP_DISABLE_PULSEAUDIO "Disable libtgvoip's PulseAudio backend." OFF LINUX ON)
 
-if (APPLE)
-    target_compile_options(lib_tgvoip_bundled
-    PRIVATE
-        -Wno-unqualified-std-cast-call
-    )
-endif()
-
 set(tgvoip_loc ${third_party_loc}/libtgvoip)
 
 nice_target_sources(lib_tgvoip_bundled ${tgvoip_loc}
@@ -135,6 +128,11 @@ PRIVATE
     TGVOIP_USE_DESKTOP_DSP
 )
 
+target_compile_options_if_exists(lib_tgvoip_bundled
+PRIVATE
+    -Wno-unqualified-std-cast-call
+)
+
 if (WIN32)
     if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
         target_compile_options(lib_tgvoip_bundled
diff --git a/Telegram/codegen b/Telegram/codegen
index 145c9e617..805b851d6 160000
--- a/Telegram/codegen
+++ b/Telegram/codegen
@@ -1 +1 @@
-Subproject commit 145c9e617170eda5932c7d7064449fe262ee2a0a
+Subproject commit 805b851d69444ab3659b619566d186d0be83dcd9
diff --git a/Telegram/lib_webview b/Telegram/lib_webview
index a9994463f..cea8958ca 160000
--- a/Telegram/lib_webview
+++ b/Telegram/lib_webview
@@ -1 +1 @@
-Subproject commit a9994463f26d6924dc37887b11b37c88f1a08d17
+Subproject commit cea8958ca2007192dbd6ce14967f74484d1fcc6f