diff --git a/src/os2/combobox.cpp b/src/os2/combobox.cpp
index ccd8e120d9..c97801ef85 100644
--- a/src/os2/combobox.cpp
+++ b/src/os2/combobox.cpp
@@ -156,10 +156,7 @@ bool wxComboBox::Create(
     //
     SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOW));
 
-    SetFont(*wxSMALL_FONT);
-
-    int                             i;
-    for (i = 0; i < n; i++)
+    for (int i = 0; i < n; i++)
     {
         Append(asChoices[i]);
     }
diff --git a/src/os2/dc.cpp b/src/os2/dc.cpp
index c0f2f0b666..b001e85568 100644
--- a/src/os2/dc.cpp
+++ b/src/os2/dc.cpp
@@ -1268,7 +1268,7 @@ void wxDC::DoDrawIcon(
     //
     // Need to copy back into a bitmap.  ::WinDrawPointer uses device coords
     // and I don't feel like figuring those out for scrollable windows so
-    // just convert to a bitmap then let the DoDrawBitmap routing display it
+    // just convert to a bitmap then let the DoDrawBitmap routine display it
     //
     if (rIcon.IsXpm())
     {
diff --git a/src/os2/statbox.cpp b/src/os2/statbox.cpp
index ef75d915d0..2464ee04b0 100644
--- a/src/os2/statbox.cpp
+++ b/src/os2/statbox.cpp
@@ -65,24 +65,20 @@ bool wxStaticBox::Create(
     SetBackgroundColour(GetParent()->GetBackgroundColour());
 
     wxColour                        vColour;
-
     vColour.Set(wxString(wxT("BLACK")));
-
     LONG                            lColor = (LONG)vColour.GetPixel();
-
     ::WinSetPresParam( m_hWnd
                       ,PP_FOREGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
-    lColor = (LONG)m_backgroundColour.GetPixel();
 
+    lColor = (LONG)m_backgroundColour.GetPixel();
     ::WinSetPresParam( m_hWnd
                       ,PP_BACKGROUNDCOLOR
                       ,sizeof(LONG)
                       ,(PVOID)&lColor
                      );
-    SetFont(*wxSMALL_FONT);
     SetSize( rPos.x
             ,rPos.y
             ,rSize.x