diff --git a/src/common/settcmn.cpp b/src/common/settcmn.cpp
index 6e84b6a118..1a890fad16 100644
--- a/src/common/settcmn.cpp
+++ b/src/common/settcmn.cpp
@@ -44,12 +44,6 @@ wxSystemScreenType wxSystemSettings::ms_screen = wxSYS_SCREEN_NONE;
 wxSystemScreenType wxSystemSettings::GetScreenType()
 {
     if (ms_screen == wxSYS_SCREEN_NONE)
-#ifndef __WXUNIVERSAL__
-    {
-        // As a start, all GUI are desktops.
-        ms_screen = wxSYS_SCREEN_DESKTOP;
-    }
-#else
     {
         // wxUniv will be used on small devices, too.
         int x = GetMetric( wxSYS_SCREEN_X );
@@ -65,7 +59,6 @@ wxSystemScreenType wxSystemSettings::GetScreenType()
         if (x < 200)
             ms_screen = wxSYS_SCREEN_TINY;
     }
-#endif
 
     return ms_screen;
 }
diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index cffcebd01b..0b46889b8b 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -586,7 +586,7 @@ 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", (const char*)s.mb_str()) == -1 )
             return -1;
     }