diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 04fac9daaf..eafbeeb586 100644
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -3550,3 +3550,5 @@ size_t wxDateTimeWorkDays::DoGetHolidaysInRange(const wxDateTime& dtStart,
 
     return holidays.GetCount();
 }
+
+
diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index c2f9f21f04..ef3ab1defc 100644
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -129,7 +129,7 @@ wxPoint wxFrameBase::GetClientAreaOrigin() const
     wxPoint pt(0, 0);
 
 #if wxUSE_TOOLBAR
-    if ( GetToolBar() )
+    if ( GetToolBar() && GetToolBar()->IsShown() )
     {
         int w, h;
         GetToolBar()->GetSize(& w, & h);
diff --git a/src/common/timercmn.cpp b/src/common/timercmn.cpp
index f6b77360a9..000226700f 100644
--- a/src/common/timercmn.cpp
+++ b/src/common/timercmn.cpp
@@ -258,7 +258,7 @@ wxLongLong wxGetLocalTimeMillis()
         return (val + tp.millitm);
     }
 #else
-#ifndef __BORLANDC__
+#if !defined(__BORLANDC__) && !(defined(__VISUALC__) && defined(__WIN16__))
     #warning "wxStopWatch will be up to second resolution!"
 #endif
 #endif