diff --git a/pcbnew/tools/pad_tool.cpp b/pcbnew/tools/pad_tool.cpp
index b28bb459aa..1c6b0dc92e 100644
--- a/pcbnew/tools/pad_tool.cpp
+++ b/pcbnew/tools/pad_tool.cpp
@@ -294,9 +294,9 @@ int PAD_TOOL::EnumeratePads( const TOOL_EVENT& aEvent )
     statusPopup.Popup();
     statusPopup.Move( wxGetMousePosition() + wxPoint( 20, 20 ) );
 
-    auto setCursor = 
-            [&]() 
-            { 
+    auto setCursor =
+            [&]()
+            {
                 frame()->GetCanvas()->SetCurrentCursor( KICURSOR::BULLSEYE );
             };
 
@@ -670,7 +670,6 @@ void PAD_TOOL::recombinePad( D_PAD* aPad )
             // Create a new minimally-sized circular anchor and convert existing pad
             // to a polygon primitive
             SHAPE_POLY_SET existingOutline;
-            int maxError = board()->GetDesignSettings().m_MaxError;
             aPad->TransformShapeWithClearanceToPolygon( existingOutline, layer, 0, maxError,
                                                         ERROR_INSIDE );
 
diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp
index 2b8eaaeacb..1b6a8b1a40 100644
--- a/pcbnew/zone_filler.cpp
+++ b/pcbnew/zone_filler.cpp
@@ -723,9 +723,9 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE_CONTAINER* aZone, PCB_LA
 
     auto evalRulesForItems =
             [&]( DRC_CONSTRAINT_TYPE_T aConstraint, const BOARD_ITEM* a, const BOARD_ITEM* b,
-                 PCB_LAYER_ID aLayer ) -> int
+                 PCB_LAYER_ID aCtLayer ) -> int
             {
-                DRC_CONSTRAINT c = bds.m_DRCEngine->EvalRulesForItems( aConstraint, a, b, aLayer );
+                DRC_CONSTRAINT c = bds.m_DRCEngine->EvalRulesForItems( aConstraint, a, b, aCtLayer );
                 return c.Value().HasMin() ? c.Value().Min() : 0;
             };