diff --git a/src/msw/app.cpp b/src/msw/app.cpp
index 32779c348d..31ce0f4bb4 100644
--- a/src/msw/app.cpp
+++ b/src/msw/app.cpp
@@ -478,7 +478,10 @@ int wxConsoleStderr::GetCommandHistory(wxWxCharBuffer& buf) const
     {
         buf.extend(len);
         const int len2 = m_pfnGetConsoleCommandHistory(buf.data(), len, CMD_EXE);
-        wxASSERT_MSG( len2 == len, _T("failed getting history?") );
+        if ( len2 != len )
+        {
+            wxFAIL_MSG( _T("failed getting history?") );
+        }
     }
 
     return len;
diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp
index baffd0fc97..7d99de260f 100644
--- a/src/msw/utils.cpp
+++ b/src/msw/utils.cpp
@@ -1180,7 +1180,7 @@ wxString wxGetOsDescription()
                                 // we can't distinguish between XP 64 and 2003
                                 // as they both are 5.2, so examine the product
                                 // type to resolve this ambiguity
-                                if ( wxIsWindowsServer() == true )
+                                if ( wxIsWindowsServer() == 1 )
                                 {
                                     str.Printf(_("Windows Server 2003 (build %lu"),
                                                info.dwBuildNumber);