diff --git a/CMakeLists.txt b/CMakeLists.txt
index 599388110f..b28fbc7137 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -347,7 +347,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
 # Enforce the search mode of non-required packages for better and shorter failure messages
 find_package(enet 1.3 MODULE)
 find_package(fmt 8 REQUIRED)
-find_package(LLVM 17.0.2 MODULE COMPONENTS Demangle)
+find_package(LLVM MODULE COMPONENTS Demangle)
 find_package(lz4 REQUIRED)
 find_package(nlohmann_json 3.8 REQUIRED)
 find_package(Opus 1.3 MODULE)
@@ -415,7 +415,7 @@ if(ENABLE_OPENSSL)
     find_package(OpenSSL 1.1.1 REQUIRED)
 endif()
 
-if (UNIX AND NOT APPLE)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
     find_package(gamemode 1.7 MODULE)
 endif()
 
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 7dacba23b6..3668193071 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -211,7 +211,7 @@ if (ANDROID)
    endif()
 endif()
 
-if (UNIX AND NOT APPLE AND NOT TARGET gamemode::headers)
+if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT TARGET gamemode::headers)
     add_library(gamemode INTERFACE)
     target_include_directories(gamemode INTERFACE gamemode)
     add_library(gamemode::headers ALIAS gamemode)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 8e167c51d9..974c05dec9 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1212,7 +1212,7 @@ if (HAS_NCE)
         arm/nce/patcher.h
         arm/nce/visitor_base.h
     )
-    target_link_libraries(core PRIVATE merry::mcl merry::oaknut)
+    target_link_libraries(core PRIVATE merry::oaknut)
 endif()
 
 if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)