diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index be0dc8d53d..6d682be476 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -599,7 +599,13 @@ int vfwprintf(FILE *stream, const wxChar *format, va_list argptr)
     if ( rc != -1 )
     {
         // we can't do much better without Unicode support in libc...
-        if ( fprintf(stream, "%s", s.mb_str()) == -1 )
+        if ( fprintf(stream, "%s",
+#if wxUSE_UNICODE
+                     s.mb_str().data()
+#else
+                     s.c_str()
+#endif
+                 ) == -1 )
             return -1;
     }
 
diff --git a/src/msw/evtloop.cpp b/src/msw/evtloop.cpp
index 2a4da8b446..1d52ec45f3 100644
--- a/src/msw/evtloop.cpp
+++ b/src/msw/evtloop.cpp
@@ -281,7 +281,7 @@ int wxEventLoop::Run()
     // wxModalEventLoop depends on this (so we can't just use ON_BLOCK_EXIT or
     // something similar here)
 #if wxUSE_EXCEPTIONS
-    bool retryAfterException;
+    bool retryAfterException = false;
     do {
         retryAfterException=false;
 #endif
diff --git a/src/msw/volume.cpp b/src/msw/volume.cpp
index d82a59aed5..f1750775a5 100644
--- a/src/msw/volume.cpp
+++ b/src/msw/volume.cpp
@@ -44,6 +44,7 @@
 #include "wx/volume.h"
 
 #include <shellapi.h>
+#include <shlobj.h>
 #include "wx/msw/missing.h"
 
 #if wxUSE_BASE