diff --git a/src/core/arm/nce/arm_nce.cpp b/src/core/arm/nce/arm_nce.cpp
index 0d525704ff..c6391177cc 100644
--- a/src/core/arm/nce/arm_nce.cpp
+++ b/src/core/arm/nce/arm_nce.cpp
@@ -260,12 +260,12 @@ void ArmNce::GuestMemoryFaultSignalHandler(int sig, void* raw_info, void* raw_co
             // TODO: handle accesses which split a page?
 #ifndef _WIN32
             const Common::ProcessAddress addr =
-                (reinterpret_cast<u64>(static_cast<siginfo_t*>(raw_info)->si_addr) & ~Memory::YUZU_PAGEMASK);
+                reinterpret_cast<u64>(static_cast<siginfo_t*>(raw_info)->si_addr) & ~(Common::HostPageSize - 1);
 #else
             const Common::ProcessAddress addr =
-                (reinterpret_cast<u64>(*static_cast<u64*>(raw_info)) & ~Memory::YUZU_PAGEMASK);
+                reinterpret_cast<u64>(*static_cast<u64*>(raw_info)) & ~(Common::HostPageSize - 1);
 #endif
-            if (memory.InvalidateNCE(addr, Memory::YUZU_PAGESIZE)) {
+            if (memory.InvalidateNCE(addr, Common::HostPageSize)) {
                 // We handled the access successfully and are returning to guest code.
                 goto ret;
             }
diff --git a/src/qt_common/game_list/model.cpp b/src/qt_common/game_list/model.cpp
index 708ef576c6..08cc990f4f 100644
--- a/src/qt_common/game_list/model.cpp
+++ b/src/qt_common/game_list/model.cpp
@@ -167,7 +167,7 @@ void GameListModel::RefreshGameDirectory() {
     ResetExternalWatcher();
     if (!UISettings::values.game_dirs.empty() && current_worker != nullptr) {
         LOG_INFO(Frontend, "Change detected in the games directory. Reloading game list.");
-        Repopulate();
+        //Repopulate();
     }
 }