diff --git a/CMakeLists.txt b/CMakeLists.txt
index d949e00a7..855a3b33f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,9 +183,8 @@ endif()
 
 if(NOT WIN32)
 	find_required_package(ZLIB)
-	find_optional_package(PulseAudio)
-	find_optional_package(MacAudio)
 	find_optional_package(PCSC)
+	find_optional_package(PulseAudio)
 
 	if(NOT ANDROID)
 		find_suggested_package(Cups)
@@ -199,7 +198,7 @@ if(NOT WIN32)
 		endif()
 	endif()
 
-	if(NOT ANDROID)
+	if((NOT ANDROID) AND (NOT APPLE))
 		find_suggested_package(FFmpeg)
 	endif()
 endif()
diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
index b20f0150d..3be209d98 100644
--- a/client/Mac/CMakeLists.txt
+++ b/client/Mac/CMakeLists.txt
@@ -81,7 +81,7 @@ set_target_properties(MacFreeRDP PROPERTIES XCODE_ATTRIBUTE_ARCHS "$(NATIVE_ARCH
 # Set the info plist to the custom instance
 set_target_properties(MacFreeRDP PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
 
-find_optional_package(MacAudio)
+#find_optional_package(MacAudio)
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${EXTRA_LIBS})
 
diff --git a/winpr/libwinpr/crt/test/TestAlignment.c b/winpr/libwinpr/crt/test/TestAlignment.c
index bd911db0f..817d29b84 100644
--- a/winpr/libwinpr/crt/test/TestAlignment.c
+++ b/winpr/libwinpr/crt/test/TestAlignment.c
@@ -1,6 +1,5 @@
 
 #include <stdio.h>
-#include <malloc.h>
 #include <winpr/crt.h>
 #include <winpr/windows.h>
 
diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedAccess.c b/winpr/libwinpr/interlocked/test/TestInterlockedAccess.c
index 38c557fa0..c6f72c839 100644
--- a/winpr/libwinpr/interlocked/test/TestInterlockedAccess.c
+++ b/winpr/libwinpr/interlocked/test/TestInterlockedAccess.c
@@ -1,6 +1,5 @@
 
 #include <stdio.h>
-#include <malloc.h>
 #include <winpr/crt.h>
 #include <winpr/windows.h>
 #include <winpr/interlocked.h>
diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedDList.c b/winpr/libwinpr/interlocked/test/TestInterlockedDList.c
index fa3a61fe6..b89a48430 100644
--- a/winpr/libwinpr/interlocked/test/TestInterlockedDList.c
+++ b/winpr/libwinpr/interlocked/test/TestInterlockedDList.c
@@ -1,6 +1,5 @@
 
 #include <stdio.h>
-#include <malloc.h>
 #include <winpr/crt.h>
 #include <winpr/windows.h>
 #include <winpr/interlocked.h>
diff --git a/winpr/libwinpr/interlocked/test/TestInterlockedSList.c b/winpr/libwinpr/interlocked/test/TestInterlockedSList.c
index 86f2b4184..380ec772b 100644
--- a/winpr/libwinpr/interlocked/test/TestInterlockedSList.c
+++ b/winpr/libwinpr/interlocked/test/TestInterlockedSList.c
@@ -1,6 +1,5 @@
 
 #include <stdio.h>
-#include <malloc.h>
 #include <winpr/crt.h>
 #include <winpr/windows.h>
 #include <winpr/interlocked.h>
diff --git a/winpr/libwinpr/sspi/NTLM/ntlm.c b/winpr/libwinpr/sspi/NTLM/ntlm.c
index e586f00ff..f408dafa3 100644
--- a/winpr/libwinpr/sspi/NTLM/ntlm.c
+++ b/winpr/libwinpr/sspi/NTLM/ntlm.c
@@ -132,7 +132,11 @@ NTLM_CONTEXT* ntlm_ContextNew()
 			RegCloseKey(hKey);
 		}
 
-		context->SuppressExtendedProtection = FALSE;
+		/*
+		 * Extended Protection is enabled by default in Windows 7,
+		 * but enabling it in WinPR breaks TS Gateway at this point
+		 */
+		context->SuppressExtendedProtection = TRUE;
 
 		status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, _T("System\\CurrentControlSet\\Control\\LSA"), 0, KEY_READ | KEY_WOW64_64KEY, &hKey);