diff --git a/scripts/check_regression_tests.py b/scripts/check_regression_tests.py
index 4dc314edd..79eb03734 100644
--- a/scripts/check_regression_tests.py
+++ b/scripts/check_regression_tests.py
@@ -336,7 +336,8 @@ def check_regression_test(baselinedir, testdir, name):
 
 def check_regression_tests(baselinedir, testdir):
     gamedirs = glob.glob(baselinedir + "/*", recursive=False)
-    
+    gamedirs.sort(key=lambda x: os.path.basename(x))
+
     success = 0
     failure = 0
 
diff --git a/scripts/run_regression_tests.py b/scripts/run_regression_tests.py
index 9805173c0..329b7df66 100644
--- a/scripts/run_regression_tests.py
+++ b/scripts/run_regression_tests.py
@@ -35,6 +35,7 @@ def run_regression_tests(runner, gamedirs, destdir, dump_interval, frames, paral
     for gamedir in gamedirs:
         paths += glob.glob(os.path.realpath(gamedir) + "/*.*", recursive=True)
     gamepaths = list(filter(is_game_path, paths))
+    gamepaths.sort(key=lambda x: os.path.basename(x))
 
     try:
         if not os.path.isdir(destdir):
diff --git a/src/duckstation-regtest/regtest_host.cpp b/src/duckstation-regtest/regtest_host.cpp
index c2a00e234..d718a8cd6 100644
--- a/src/duckstation-regtest/regtest_host.cpp
+++ b/src/duckstation-regtest/regtest_host.cpp
@@ -879,6 +879,8 @@ std::string RegTestHost::GetFrameDumpPath(u32 frame)
 
 int main(int argc, char* argv[])
 {
+  CrashHandler::Install(&Bus::CleanupMemoryMap);
+
   Error startup_error;
   if (!System::PerformEarlyHardwareChecks(&startup_error) || !System::ProcessStartup(&startup_error))
   {
diff --git a/src/util/image.h b/src/util/image.h
index 239cc5f8a..c68b0b49b 100644
--- a/src/util/image.h
+++ b/src/util/image.h
@@ -63,11 +63,8 @@ public:
   ALWAYS_INLINE ImageFormat GetFormat() const { return m_format; }
   ALWAYS_INLINE const u8* GetPixels() const { return std::assume_aligned<VECTOR_ALIGNMENT>(m_pixels.get()); }
   ALWAYS_INLINE u8* GetPixels() { return std::assume_aligned<VECTOR_ALIGNMENT>(m_pixels.get()); }
-  ALWAYS_INLINE const u8* GetRowPixels(u32 y) const
-  {
-    return std::assume_aligned<VECTOR_ALIGNMENT>(&m_pixels[y * m_pitch]);
-  }
-  ALWAYS_INLINE u8* GetRowPixels(u32 y) { return std::assume_aligned<VECTOR_ALIGNMENT>(&m_pixels[y * m_pitch]); }
+  ALWAYS_INLINE const u8* GetRowPixels(u32 y) const { return &m_pixels[y * m_pitch]; }
+  ALWAYS_INLINE u8* GetRowPixels(u32 y) { return &m_pixels[y * m_pitch]; }
 
   u32 GetBlocksWide() const;
   u32 GetBlocksHigh() const;