diff --git a/src/os2/app.cpp b/src/os2/app.cpp
index 5b4045dd7a..9fd52c76b7 100644
--- a/src/os2/app.cpp
+++ b/src/os2/app.cpp
@@ -536,7 +536,6 @@ wxApp::~wxApp()
         delete[] argv[i];
     }
     delete[] argv;
-#endif
 } // end of wxApp::~wxApp
 
 bool wxApp::Initialized()
@@ -884,7 +883,7 @@ void wxExit()
     wxLogError(_("Fatal error: exiting"));
 
     wxApp::CleanUp();
-} // end of wxExit 
+} // end of wxExit
 
 //
 // Yield to incoming messages
@@ -893,7 +892,7 @@ bool wxYield()
 {
     HAB                             vHab = 0;
     QMSG                            vMsg;
-  
+
     //
     // Disable log flushing from here because a call to wxYield() shouldn't
     // normally result in message boxes popping up &c
diff --git a/src/os2/settings.cpp b/src/os2/settings.cpp
index 55da0d4963..c47c24d5c4 100644
--- a/src/os2/settings.cpp
+++ b/src/os2/settings.cpp
@@ -188,7 +188,7 @@ wxFont wxSystemSettings::GetSystemFont(int index)
         }
     }
 
-    return wxFont();
+    return *wxSWISS_FONT;
 }
 
 // Get a system metric, e.g. scrollbar size