diff --git a/pcbnew/class_pad.cpp b/pcbnew/class_pad.cpp
index 5b3f407ff0..0a67a618a7 100644
--- a/pcbnew/class_pad.cpp
+++ b/pcbnew/class_pad.cpp
@@ -1342,7 +1342,7 @@ unsigned int D_PAD::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) const
         if( divisor == 0 )
             return HIDE;
 
-        return ( Millimeter2iu( 20 ) / divisor );
+        return ( Millimeter2iu( 10 ) / divisor );
     }
 
     // Other layers are shown without any conditions
diff --git a/pcbnew/class_track.cpp b/pcbnew/class_track.cpp
index 82d8a369c5..2050c9aa32 100644
--- a/pcbnew/class_track.cpp
+++ b/pcbnew/class_track.cpp
@@ -770,7 +770,7 @@ unsigned int TRACK::ViewGetLOD( int aLayer, KIGFX::VIEW* aView ) const
     // Netnames will be shown only if zoom is appropriate
     if( IsNetnameLayer( aLayer ) )
     {
-        return ( 4000000 / ( m_Width + 1 ) );
+        return ( Millimeter2iu( 4 ) / ( m_Width + 1 ) );
     }
 
     // Other layers are shown without any conditions
diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp
index fd26950fa5..6c53655095 100644
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@@ -2159,7 +2159,7 @@ void SELECTION_TOOL::guessSelectionCandidates( GENERAL_COLLECTOR& aCollector,
                     continue;
                 // reject ALL OTHER footprints if there's still something else left
                 // to select
-                else if( rejected.size() + 1 < aCollector.GetCount() )
+                else if( int( rejected.size() + 1 ) < aCollector.GetCount() )
                     rejected.insert( mod );
             }
         }