diff --git a/polymer/eduke32/build/src/sdlayer.c b/polymer/eduke32/build/src/sdlayer.c
index d0c3a86bb..27721df06 100644
--- a/polymer/eduke32/build/src/sdlayer.c
+++ b/polymer/eduke32/build/src/sdlayer.c
@@ -509,6 +509,8 @@ void initprintf(const char *f, ...)
         startwin_puts(dabuf);
 #ifndef _WIN32
         startwin_idle(NULL);
+#else
+        handleevents();
 #endif
         Bmemset(dabuf, 0, sizeof(dabuf));
     }
diff --git a/polymer/eduke32/build/src/winbits.c b/polymer/eduke32/build/src/winbits.c
index 7d0f3d6f8..6ac120201 100644
--- a/polymer/eduke32/build/src/winbits.c
+++ b/polymer/eduke32/build/src/winbits.c
@@ -90,8 +90,10 @@ static void win_printversion(void)
         break;
     }
 
-    initprintf("Windows %s %s (build %lu.%lu.%lu)\n", ver, osv.szCSDVersion,
-               osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber);
+    initprintf("Windows %s", ver);
+    if (osv.szCSDVersion && osv.szCSDVersion[0])
+        initprintf(" %s", osv.szCSDVersion);
+    initprintf(" (build %lu.%lu.%lu)\n", osv.dwMajorVersion, osv.dwMinorVersion, osv.dwBuildNumber);
 }
 
 //
@@ -254,6 +256,11 @@ LPTSTR GetWindowsErrorMsg(DWORD code)
     return lpMsgBuf;
 }
 
+
+//
+// Miscellaneous
+//
+
 int32_t addsearchpath_ProgramFiles(const char *p)
 {
     int32_t returncode = -1, i;
diff --git a/polymer/eduke32/source/startwin.game.c b/polymer/eduke32/source/startwin.game.c
index ec5d22712..0ea962e46 100644
--- a/polymer/eduke32/source/startwin.game.c
+++ b/polymer/eduke32/source/startwin.game.c
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "sounds.h"
 
 #include "build.h"
-#include "winlayer.h"
+#include "renderlayer.h"
 #include "compat.h"
 
 #include "grpscan.h"