diff --git a/src/win32/VBA.cpp b/src/win32/VBA.cpp
index 14ad67b4..7d8fdbe8 100644
--- a/src/win32/VBA.cpp
+++ b/src/win32/VBA.cpp
@@ -1015,7 +1015,12 @@ void systemMessage(int number, const char *defaultMsg, ...)
   va_start(valist, defaultMsg);
   buffer.FormatV(msg, valist);
 
-  AfxGetApp()->m_pMainWnd->MessageBox(buffer, winResLoadString(IDS_ERROR), MB_OK|MB_ICONERROR);
+  CWnd *win = AfxGetApp()->GetMainWnd();
+  if (win)
+    win = win->GetLastActivePopup(); // possible modal dialog
+  if (!win)
+    win = AfxGetApp()->m_pMainWnd;
+  win->MessageBox(buffer, winResLoadString(IDS_ERROR), MB_OK|MB_ICONERROR);
 
   va_end(valist);
 }
@@ -1377,8 +1382,11 @@ void VBA::loadSettings()
 	  renderMethod = OPENGL;
   }
 #endif
-
+#ifndef NO_XAUDIO2
   audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", XAUDIO2 );
+#else
+  audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", DIRECTSOUND );
+#endif
   if( ( audioAPI != DIRECTSOUND )
 #ifndef NO_OAL
 	  && ( audioAPI != OPENAL_SOUND )
diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc
index 024e47f5..8ce20fa7 100644
--- a/src/win32/VBA.rc
+++ b/src/win32/VBA.rc
@@ -1687,7 +1687,7 @@ BEGIN
         BEGIN
             MENUITEM "&Battery file...",            ID_FILE_IMPORT_BATTERYFILE
             MENUITEM "Gameshark &code file...",     ID_FILE_IMPORT_GAMESHARKCODEFILE
-            MENUITEM "&Gameshark Snapshot...",      ID_FILE_IMPORT_GAMESHARKSNAPSHOT
+            MENUITEM "&Gameshark/Pro Action Replay Snapshot...",      ID_FILE_IMPORT_GAMESHARKSNAPSHOT
         END
         POPUP "Export"
         BEGIN
@@ -2225,7 +2225,7 @@ BEGIN
     IDS_LOADED_CHEATS       "Loaded cheats"
     IDS_ERROR_DISP_COLOR    "Unsupported display setting for color depth: %d bits. \nWindows desktop must be in either 16-bit, 24-bit or 32-bit mode for this program to work in window mode."
     IDS_ADD_GSA_CODE        "Add GameSharkAdvance code"
-    IDS_FILTER_SPS          "Gameshark Snapshot_*.SPS__"
+    IDS_FILTER_SPS          "GS & PAC Snapshots (*.SPS;*.XPS)_*.SPS;*.XPS__"
     IDS_SELECT_SNAPSHOT_FILE "Select snapshot file"
     IDS_FILTER_SAV          "Battery file_*.SAV_Flash save_*.DAT__"
     IDS_SELECT_BATTERY_FILE "Select battery file"