diff --git a/src/common/assert.cpp b/src/common/assert.cpp
index 4c8f57882b..733534019b 100644
--- a/src/common/assert.cpp
+++ b/src/common/assert.cpp
@@ -17,12 +17,12 @@ void AssertFailSoftImpl() {
     if (Settings::values.use_debug_asserts) {
         Common::Log::Stop();
 #ifndef _MSC_VER
-#   if defined(ARCHITECTURE_x86_64)
+#   if __has_builtin(__builtin_debugtrap)
+        __builtin_debugtrap();
+#   elif defined(ARCHITECTURE_x86_64)
         __asm__ __volatile__("int $3");
 #   elif defined(ARCHITECTURE_arm64)
         __asm__ __volatile__("brk #0");
-#   else
-        __builtin_debugtrap();
 #   endif
 #else // Clang/GCC ^^^ MSVC vvv
         DebugBreak();
diff --git a/src/common/multi_level_page_table.inc b/src/common/multi_level_page_table.inc
index a2e61a161e..2d8a8ed7b4 100644
--- a/src/common/multi_level_page_table.inc
+++ b/src/common/multi_level_page_table.inc
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2026 Eden Emulator Project
+// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
 // SPDX-License-Identifier: GPL-3.0-or-later
 
 // SPDX-FileCopyrightText: 2021 yuzu Emulator Project
diff --git a/src/core/arm/nce/arm_nce.cpp b/src/core/arm/nce/arm_nce.cpp
index f6ecefaacb..f4f989e0df 100644
--- a/src/core/arm/nce/arm_nce.cpp
+++ b/src/core/arm/nce/arm_nce.cpp
@@ -455,7 +455,7 @@ HaltReason ArmNce::RunThread(Kernel::KThread* thread) {
 #if defined(__APPLE__)
     ASSERT(pthread_setspecific(ContextKey, &thread_params) == 0);
 #elif defined(_WIN32)
-    ASSERT_MSG(TlsSetValue(ContextKey, &thread_params) == 0, "Failed to set TLS value: id {}, error {}", ContextKey, GetLastError());
+    ASSERT_MSG(TlsSetValue(ContextKey, &thread_params), "Failed to set TLS value: id {}, error {}", ContextKey, GetLastError());
 #endif
 
     // Move non-critical operations outside the locked section