diff --git a/common/drawframe.cpp b/common/drawframe.cpp
index 5c29adcfdd..ac0669ef7d 100644
--- a/common/drawframe.cpp
+++ b/common/drawframe.cpp
@@ -720,12 +720,9 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
 {
     BASE_SCREEN* screen = GetScreen();
 
-    if( screen == NULL || m_canvas == NULL )
+    if( !screen || !m_canvas )
         return;
 
-    // There are no safety limits on these calculations, so in NANOMETRES build it
-    // still blows up.  This is incomplete work.
-
     double scale = screen->GetScalingFactor();
 
     wxLogTrace( traceScrollSettings, wxT( "Center Position = ( %d, %d ), scale = %.10g" ),
@@ -933,7 +930,7 @@ wxPoint EDA_DRAW_FRAME::GetCrossHairPosition( bool aInvertY ) const
     // subject to change, borrow from old BASE_SCREEN for now.
 
     BASE_SCREEN* screen = GetScreen();  // virtual call
-    return screen->getCrossHairPosition();
+    return screen->getCrossHairPosition( aInvertY );
 }