diff --git a/pcbnew/router/pns_line_placer.cpp b/pcbnew/router/pns_line_placer.cpp
index 762fbbaae7..e7c84df539 100644
--- a/pcbnew/router/pns_line_placer.cpp
+++ b/pcbnew/router/pns_line_placer.cpp
@@ -528,16 +528,16 @@ bool LINE_PLACER::routeHead( const VECTOR2I& aP, LINE& aNewHead )
 
 bool LINE_PLACER::optimizeTailHeadTransition()
 {
-    LINE tmp = Trace();
+    LINE linetmp = Trace();
 
-    if( OPTIMIZER::Optimize( &tmp, OPTIMIZER::FANOUT_CLEANUP, m_currentNode ) )
+    if( OPTIMIZER::Optimize( &linetmp, OPTIMIZER::FANOUT_CLEANUP, m_currentNode ) )
     {
-        if( tmp.SegmentCount() < 1 )
+        if( linetmp.SegmentCount() < 1 )
             return false;
 
-        m_head = tmp;
-        m_p_start = tmp.CLine().CPoint( 0 );
-        m_direction = DIRECTION_45( tmp.CSegment( 0 ) );
+        m_head = linetmp;
+        m_p_start = linetmp.CLine().CPoint( 0 );
+        m_direction = DIRECTION_45( linetmp.CSegment( 0 ) );
         m_tail.Line().Clear();
 
         return true;
diff --git a/pcbnew/router/pns_node.cpp b/pcbnew/router/pns_node.cpp
index 6614408a3b..ac74978b77 100644
--- a/pcbnew/router/pns_node.cpp
+++ b/pcbnew/router/pns_node.cpp
@@ -347,7 +347,7 @@ NODE::OPT_OBSTACLE NODE::NearestObstacle( const LINE* aItem, int aKindMask,
 
         if( aLine.EndsWithVia() )
         {
-            int clearance = GetClearance( obs.m_item, &aLine.Via() );
+            clearance = GetClearance( obs.m_item, &aLine.Via() );
 
             SHAPE_LINE_CHAIN viaHull = aLine.Via().Hull( clearance, aItem->Width() );
 
diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp
index 8253c78b24..f6b552f9fa 100644
--- a/pcbnew/tools/edit_tool.cpp
+++ b/pcbnew/tools/edit_tool.cpp
@@ -216,9 +216,9 @@ int EDIT_TOOL::Main( const TOOL_EVENT& aEvent )
                         lockOverride = true;
 
                     // Save items, so changes can be undone
-                    selection.ForAll<BOARD_ITEM>( [&](BOARD_ITEM* item)
+                    selection.ForAll<BOARD_ITEM>( [&](BOARD_ITEM* brd_item)
                     {
-                        m_commit->Modify( item );
+                        m_commit->Modify( brd_item );
                     } );
 
                     m_cursor = controls->GetCursorPosition();
diff --git a/pcbnew/tools/point_editor.cpp b/pcbnew/tools/point_editor.cpp
index 48705ae7cc..025d531b41 100644
--- a/pcbnew/tools/point_editor.cpp
+++ b/pcbnew/tools/point_editor.cpp
@@ -778,7 +778,6 @@ void POINT_EDITOR::addCorner( const VECTOR2I& aBreakPoint )
 
         if( segment->GetShape() == S_SEGMENT )
         {
-            BOARD_COMMIT commit( frame );
             commit.Modify( segment );
 
             SEG seg( segment->GetStart(), segment->GetEnd() );