diff --git a/source/build/include/winbits.h b/source/build/include/winbits.h
index 6518e8e36..58513e6d1 100644
--- a/source/build/include/winbits.h
+++ b/source/build/include/winbits.h
@@ -2,7 +2,11 @@
 
 #include "compat.h"
 
-#define WindowClass "buildapp"
+#ifdef APPNAME
+# define WindowClass APPNAME
+#else
+# define WindowClass "buildapp"
+#endif
 
 extern int32_t backgroundidle;	// set to 1 to tell winlayer to go to idle priority when inactive
 
diff --git a/source/build/src/winbits.cpp b/source/build/src/winbits.cpp
index 4283e0209..cdc1e24cd 100644
--- a/source/build/src/winbits.cpp
+++ b/source/build/src/winbits.cpp
@@ -101,7 +101,7 @@ static void win_printversion(void)
     int l;
 
     if (pwinever)
-        l = Bsprintf(str, "Wine %s identifying as Windows %s", (char *)pwinever(), ver);
+        l = Bsprintf(str, "Wine %s, identifying as Windows %s", (char *)pwinever(), ver);
     else
         l = Bsprintf(str, "Windows %s", ver);
 
diff --git a/source/duke3d/src/game.cpp b/source/duke3d/src/game.cpp
index 4265b1097..e59805ef8 100644
--- a/source/duke3d/src/game.cpp
+++ b/source/duke3d/src/game.cpp
@@ -6219,12 +6219,18 @@ int app_main(int argc, char const * const * argv)
 #endif
 
 #ifdef _WIN32
+#ifndef DEBUGGINGAIDS
     if (!G_CheckCmdSwitch(argc, argv, "-noinstancechecking") && win_checkinstance())
     {
+#ifdef EDUKE32_STANDALONE
+        if (!wm_ynbox(APPNAME, APPNAME " is already running. "
+#else
         if (!wm_ynbox(APPNAME, "Another Build game is currently running. "
-                      "Do you wish to continue starting this copy?"))
+#endif
+                      "Are you sure you want to start another copy?"))
             return 3;
     }
+#endif
 
     backgroundidle = 0;