diff --git a/.clang-tidy b/.clang-tidy
index a74f40275..e746ac41d 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -43,7 +43,7 @@ Checks: >
     -cppcoreguidelines-no-malloc,
     -google-readability-braces-around-statements,
     -google-readability-todo,
-    -hicpp-avoid-c_arrays,
+    -hicpp-avoid-c-arrays,
     -hicpp-braces-around-statements,
     -hicpp-no-array-decay,
     -hicpp-no-assembler,
diff --git a/channels/rdpecam/client/CMakeLists.txt b/channels/rdpecam/client/CMakeLists.txt
index 61b211567..ce3438ff5 100644
--- a/channels/rdpecam/client/CMakeLists.txt
+++ b/channels/rdpecam/client/CMakeLists.txt
@@ -42,7 +42,7 @@ set(${MODULE_PREFIX}_SRCS
 set(${MODULE_PREFIX}_LIBS
 	freerdp
     winpr
-    ${SWSCALE_LIBRARY}
+    ${SWSCALE_LIBRARIES}
     ${FFMPEG_LIBRARIES}
 )
 
diff --git a/libfreerdp/CMakeLists.txt b/libfreerdp/CMakeLists.txt
index c8afe4b05..708784194 100644
--- a/libfreerdp/CMakeLists.txt
+++ b/libfreerdp/CMakeLists.txt
@@ -148,7 +148,7 @@ endif(WITH_CAIRO)
 # Prefer SWScale over Cairo, both at the same time are not possible.
 if (WITH_SWSCALE)
 	include_directories(SYSTEM ${SWSCALE_INCLUDE_DIRS})
-	freerdp_library_add(${SWSCALE_LIBRARY})
+	freerdp_library_add(${SWSCALE_LIBRARIES})
 endif()
 if (WITH_CAIRO)
     include_directories(SYSTEM ${CAIRO_INCLUDE_DIR})
diff --git a/libfreerdp/codec/dsp.c b/libfreerdp/codec/dsp.c
index c13ed4927..f5b959800 100644
--- a/libfreerdp/codec/dsp.c
+++ b/libfreerdp/codec/dsp.c
@@ -1531,7 +1531,7 @@ BOOL freerdp_dsp_context_reset(FREERDP_DSP_CONTEXT* WINPR_RESTRICT context,
 #endif
 #if defined(WITH_FAAC)
 
-	if (context->encoder)
+	if (context->common.encoder)
 	{
 		faacEncConfigurationPtr cfg;
 
diff --git a/scripts/bundle-mac-os.sh b/scripts/bundle-mac-os.sh
index 6a39fbee0..4ce7c7c21 100755
--- a/scripts/bundle-mac-os.sh
+++ b/scripts/bundle-mac-os.sh
@@ -137,6 +137,7 @@ CMAKE_ARGS="-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \
 	-DINSTALL_BIN_DIR='$INSTALL/bin' \
 	-DCMAKE_PREFIX_PATH='$INSTALL;$INSTALL/lib;$INSTALL/lib/cmake' \
 	-DCMAKE_IGNORE_PATH='/opt/local;/usr/local;/opt/homebrew;/Library;~/Library'
+	-DCMAKE_IGNORE_PREFIX_PATH='/opt/local;/usr/local;/opt/homebrew;/Library;~/Library'
 	"
 
 if [ ! -d $SRC ];
@@ -278,7 +279,8 @@ cmake -GNinja -Bfreerdp -S"$SCRIPT_PATH/.." \
 	-DWITH_FAAC=ON \
 	-DWITH_INTERNAL_RC4=ON \
 	-DWITH_INTERNAL_MD4=ON \
-	-DWITH_INTERNAL_MD5=ON
+	-DWITH_INTERNAL_MD5=ON \
+    -DCHANNEL_RDPEAR=OFF
 cmake --build freerdp
 cmake --install freerdp
 
diff --git a/server/proxy/pf_server.c b/server/proxy/pf_server.c
index 6955e5229..417a8e094 100644
--- a/server/proxy/pf_server.c
+++ b/server/proxy/pf_server.c
@@ -158,13 +158,23 @@ static BOOL pf_server_get_target_info(rdpContext* context, rdpSettings* settings
 			}
 
 			if (config->TargetUser)
-				freerdp_settings_set_string(settings, FreeRDP_Username, config->TargetUser);
+			{
+				if (!freerdp_settings_set_string(settings, FreeRDP_Username, config->TargetUser))
+					return FALSE;
+			}
 
 			if (config->TargetDomain)
-				freerdp_settings_set_string(settings, FreeRDP_Domain, config->TargetDomain);
+			{
+				if (!freerdp_settings_set_string(settings, FreeRDP_Domain, config->TargetDomain))
+					return FALSE;
+			}
 
 			if (config->TargetPassword)
-				freerdp_settings_set_string(settings, FreeRDP_Password, config->TargetPassword);
+			{
+				if (!freerdp_settings_set_string(settings, FreeRDP_Password,
+				                                 config->TargetPassword))
+					return FALSE;
+			}
 
 			return TRUE;
 		}