diff --git a/CMakeLists.txt b/CMakeLists.txt
index e18003e344..0ca88e3c65 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -400,6 +400,7 @@ if (YUZU_USE_CPM)
 
             if (MSVC AND ARCHITECTURE_x86_64)
                 set(DOWNLOAD_ONLY OFF)
+                set(BUILD_SHARED_LIBS OFF)
             else()
                 set(DOWNLOAD_ONLY ON)
             endif()
@@ -420,6 +421,8 @@ if (YUZU_USE_CPM)
             if (NOT DOWNLOAD_ONLY)
                 set(OPENSSL_DIR ${OpenSSL-windows-amd64_SOURCE_DIR})
             endif()
+            message("OPENSSL ${DOWNLOAD_ONLY} ${OPENSSL_DIR}")
+
         endif()
 
         if ((MSVC AND ARCHITECTURE_arm64) OR FORCE_DOWNLOAD_OPENSSL)
@@ -428,6 +431,7 @@ if (YUZU_USE_CPM)
 
             if (MSVC AND ARCHITECTURE_arm64)
                 set(DOWNLOAD_ONLY OFF)
+                set(BUILD_SHARED_LIBS OFF)
             else()
                 set(DOWNLOAD_ONLY ON)
             endif()
@@ -453,6 +457,7 @@ if (YUZU_USE_CPM)
         if (ANDROID OR FORCE_DOWNLOAD_OPENSSL)
             if (ANDROID)
                 set(DOWNLOAD_ONLY OFF)
+                set(BUILD_SHARED_LIBS OFF)
             else()
                 set(DOWNLOAD_ONLY ON)
             endif()
@@ -478,6 +483,7 @@ if (YUZU_USE_CPM)
         if(PLATFORM_SUN OR FORCE_DOWNLOAD_OPENSSL)
             if (PLATFORM_SUN)
                 set(DOWNLOAD_ONLY OFF)
+                set(BUILD_SHARED_LIBS OFF)
             else()
                 set(DOWNLOAD_ONLY ON)
             endif()
@@ -503,6 +509,7 @@ if (YUZU_USE_CPM)
         if(PLATFORM_FREEBSD OR FORCE_DOWNLOAD_OPENSSL)
             if (PLATFORM_FREEBSD)
                 set(DOWNLOAD_ONLY OFF)
+                set(BUILD_SHARED_LIBS OFF)
             else()
                 set(DOWNLOAD_ONLY ON)
             endif()
@@ -528,6 +535,7 @@ if (YUZU_USE_CPM)
         if(PLATFORM_LINUX OR FORCE_DOWNLOAD_OPENSSL)
             if (PLATFORM_LINUX)
                 set(DOWNLOAD_ONLY OFF)
+                set(BUILD_SHARED_LIBS OFF)
             else()
                 set(DOWNLOAD_ONLY ON)
             endif()
@@ -552,7 +560,6 @@ if (YUZU_USE_CPM)
 
         if (DEFINED OPENSSL_DIR)
             include(${OPENSSL_DIR}/openssl.cmake)
-            set(OpenSSL_ADDED ON)
 
             # Overrides find package
             CPMAddPackage(
@@ -561,7 +568,6 @@ if (YUZU_USE_CPM)
             )
         else()
             find_package(OpenSSL 1.1.1 REQUIRED)
-            set(OpenSSL_ADDED OFF)
         endif()
     endif()
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index ba646f76e3..5f9bfa2214 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1249,10 +1249,11 @@ if(ENABLE_OPENSSL)
     target_sources(core PRIVATE
         hle/service/ssl/ssl_backend_openssl.cpp)
 
+    find_package(OpenSSL REQUIRED)
+
     if (OpenSSL_ADDED)
         link_openssl(core)
     else()
-        find_package(OpenSSL REQUIRED)
         target_link_libraries(core PRIVATE OpenSSL::SSL)
     endif()
 elseif (APPLE)
diff --git a/src/dynarmic/src/dynarmic/frontend/A32/a32_types.h b/src/dynarmic/src/dynarmic/frontend/A32/a32_types.h
index 5afd82f77f..fdadef8257 100644
--- a/src/dynarmic/src/dynarmic/frontend/A32/a32_types.h
+++ b/src/dynarmic/src/dynarmic/frontend/A32/a32_types.h
@@ -105,7 +105,7 @@ inline size_t RegNumber(ExtReg reg) {
         return static_cast<size_t>(reg) - static_cast<size_t>(ExtReg::Q0);
     }
 
-    ASSERT_FALSE("Invalid extended register");
+    ASSERT_MSG(false, "Invalid extended register");
 }
 
 inline Reg operator+(Reg reg, size_t number) {