diff --git a/src/m_pd.h b/src/m_pd.h
index 690661dec4b28d8c908e21d5de6e2375215c8182..f494ff5225ed32b921705cf2d31959e3e55f5d76 100644
--- a/src/m_pd.h
+++ b/src/m_pd.h
@@ -11,7 +11,7 @@ extern "C" {
 #define PD_MAJOR_VERSION 0
 #define PD_MINOR_VERSION 41
 #define PD_BUGFIX_VERSION 0
-#define PD_TEST_VERSION "test12"
+#define PD_TEST_VERSION ""
 
 /* old name for "MSW" flag -- we have to take it for the sake of many old
 "nmakefiles" for externs, which will define NT and not MSW */
diff --git a/src/s_loader.c b/src/s_loader.c
index da2732f390059a103072628cee3b40fd84eb49b6..aac508985cefca41c255558782b70b03e4121aa4 100644
--- a/src/s_loader.c
+++ b/src/s_loader.c
@@ -20,6 +20,9 @@
 #include "m_pd.h"
 #include "s_stuff.h"
 #include <stdio.h>
+#ifdef _MSC_VER  /* This is only for Microsoft's compiler, not cygwin, e.g. */
+#define snprintf sprintf_s
+#endif
 
 typedef void (*t_xxx)(void);
 
diff --git a/src/s_main.c b/src/s_main.c
index 1838a0a7d02b65092979f0a378154f9a5a80f832..877ed41f626953dc8e90b26c7240acdb3243b67d 100644
--- a/src/s_main.c
+++ b/src/s_main.c
@@ -169,7 +169,11 @@ int sys_fontheight(int fontsize)
 }
 
 int sys_defaultfont;
+#ifdef MSW
+#define DEFAULTFONT 12
+#else
 #define DEFAULTFONT 10
+#endif
 
 static void openit(const char *dirname, const char *filename)
 {