diff --git a/Resource/ResCxbx.h b/Resource/ResCxbx.h
index 4d3ade995..0d9555ff5 100644
--- a/Resource/ResCxbx.h
+++ b/Resource/ResCxbx.h
@@ -35,7 +35,7 @@
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        111
-#define _APS_NEXT_COMMAND_VALUE         40041
+#define _APS_NEXT_COMMAND_VALUE         40045
 #define _APS_NEXT_CONTROL_VALUE         1000
 #define _APS_NEXT_SYMED_VALUE           103
 #endif
diff --git a/Source/Win32/Cxbx/WinMain.cpp b/Source/Win32/Cxbx/WinMain.cpp
index 645e38bd3..e6db7bdcc 100644
--- a/Source/Win32/Cxbx/WinMain.cpp
+++ b/Source/Win32/Cxbx/WinMain.cpp
@@ -59,7 +59,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
         Sleep(10);
 
     if(MainWindow->GetError() != 0)
-        MessageBox(NULL, MainWindow->GetError(), "Cxbx", MB_OK);
+        MessageBox(NULL, MainWindow->GetError(), "Cxbx", MB_ICONSTOP | MB_OK);
 
     delete MainWindow;
 
diff --git a/Source/Win32/Cxbx/WndMain.cpp b/Source/Win32/Cxbx/WndMain.cpp
index dd00eaf44..23b433bb6 100644
--- a/Source/Win32/Cxbx/WndMain.cpp
+++ b/Source/Win32/Cxbx/WndMain.cpp
@@ -214,7 +214,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
 			// * draw splash/logo/status
 			// ******************************************************************
 			{
-				BitBlt(hDC, 0, (m_Xbe == 0) ? 0 : 10, 320, 160, m_BackDC, 0, 0, SRCCOPY);
+				BitBlt(hDC, 0, (m_Xbe != 0) ? 0 : 10, 320, 160, m_BackDC, 0, 0, SRCCOPY);
 				BitBlt(hDC, 220, 168, 100, 17, m_LogoDC, 0, 0, SRCCOPY);
 
 				int nHeight = -MulDiv(8, GetDeviceCaps(hDC, LOGPIXELSY), 72);
@@ -730,7 +730,7 @@ LRESULT CALLBACK WndMain::WndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lP
                     else
                         m_KrnlDebug = DM_NONE;
 
-                    MessageBox(m_hwnd, "This will not take effect until emulation is (re)started.\n", "Cxbx", MB_OK);
+                    MessageBox(m_hwnd, "This will not take effect until the next time emulation is started.\n", "Cxbx", MB_OK);
 
                     m_bExeChanged = true;