diff --git a/pcbnew/class_board_connected_item.cpp b/pcbnew/class_board_connected_item.cpp
index 63992db717..146139e2f4 100644
--- a/pcbnew/class_board_connected_item.cpp
+++ b/pcbnew/class_board_connected_item.cpp
@@ -39,7 +39,7 @@
 BOARD_CONNECTED_ITEM::BOARD_CONNECTED_ITEM( BOARD_ITEM* aParent, KICAD_T idtype ) :
     BOARD_ITEM( aParent, idtype ), m_netinfo( &NETINFO_LIST::ORPHANED_ITEM )
 {
-    m_localRatsnestVisible = false;
+    m_localRatsnestVisible = true;
 }
 
 
diff --git a/pcbnew/router/router_tool.cpp b/pcbnew/router/router_tool.cpp
index 2b51cc6212..c76f0051ce 100644
--- a/pcbnew/router/router_tool.cpp
+++ b/pcbnew/router/router_tool.cpp
@@ -890,10 +890,12 @@ int ROUTER_TOOL::mainLoop( PNS::ROUTER_MODE aMode )
         }
         else if( evt->IsAction( &PCB_ACTIONS::dragFreeAngle ) )
         {
+            updateStartItem( *evt );
             performDragging( PNS::DM_ANY | PNS::DM_FREE_ANGLE );
         }
         else if( evt->IsAction( &PCB_ACTIONS::drag45Degree ) )
         {
+            updateStartItem( *evt );
             performDragging( PNS::DM_ANY );
         }
         else if( evt->IsAction( &PCB_ACTIONS::breakTrack ) )
@@ -916,10 +918,12 @@ int ROUTER_TOOL::mainLoop( PNS::ROUTER_MODE aMode )
         }
         else if( evt->IsAction( &PCB_ACTIONS::remove ) )
         {
+            updateStartItem( *evt );
             deleteTraces( m_startItem, false );
         }
         else if( evt->IsAction( &PCB_ACTIONS::removeAlt ) )
         {
+            updateStartItem( *evt );
             deleteTraces( m_startItem, true );
         }
     }
@@ -981,7 +985,7 @@ void ROUTER_TOOL::performDragging( int aMode )
     if( m_router->RoutingInProgress() )
         m_router->StopRouting();
 
-    m_startItem = NULL;
+    m_startItem = nullptr;
 
     frame()->UndoRedoBlock( false );
     ctls->SetAutoPan( false );