diff --git a/pcbnew/dialogs/panel_setup_rules.cpp b/pcbnew/dialogs/panel_setup_rules.cpp
index 9c7e454de2..88f81ba721 100644
--- a/pcbnew/dialogs/panel_setup_rules.cpp
+++ b/pcbnew/dialogs/panel_setup_rules.cpp
@@ -216,7 +216,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
 
     enum
     {
-        NONE,
+        NO_CONTEXT,
         STRING,
         SEXPR_OPEN,
         SEXPR_TOKEN,
@@ -275,8 +275,8 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
     wxString             partial;
     wxString             last;
     wxString             constraintType;
-    int                  context = NONE;
-    int                  expr_context = NONE;
+    int                  context = NO_CONTEXT;
+    int                  expr_context = NO_CONTEXT;
 
     for( int i = startPos; i < currentPos; ++i )
     {
@@ -290,14 +290,14 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
         {
             if( c == '"' )
             {
-                context = NONE;
+                context = NO_CONTEXT;
             }
             else
             {
                 if( expr_context == STRING )
                 {
                     if( c == '\'' )
-                        expr_context = NONE;
+                        expr_context = NO_CONTEXT;
                     else
                         partial += c;
                 }
@@ -364,7 +364,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
                 }
             }
 
-            context = NONE;
+            context = NO_CONTEXT;
         }
         else if( c == ' ' )
         {
@@ -386,7 +386,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
                 }
                 else
                 {
-                    context = NONE;
+                    context = NO_CONTEXT;
                 }
 
                 partial = wxEmptyString;
@@ -418,7 +418,7 @@ void PANEL_SETUP_RULES::onScintillaCharAdded( wxStyledTextEvent &aEvent )
                 constraintType = partial;
             }
 
-            context = NONE;
+            context = NO_CONTEXT;
         }
         else
         {
diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp
index eed4437238..4eb23bd81e 100644
--- a/pcbnew/zone_filler.cpp
+++ b/pcbnew/zone_filler.cpp
@@ -1893,7 +1893,6 @@ bool ZONE_FILLER::fillNonCopperZone( const ZONE* aZone, PCB_LAYER_ID aLayer,
                                      const SHAPE_POLY_SET& aSmoothedOutline,
                                      SHAPE_POLY_SET& aFillPolys )
 {
-    BOARD_DESIGN_SETTINGS& bds = m_board->GetDesignSettings();
     BOX2I                  zone_boundingbox = aZone->GetBoundingBox();
     SHAPE_POLY_SET         clearanceHoles;
     long                   ticker = 0;