diff --git a/kicad/CMakeLists.txt b/kicad/CMakeLists.txt
index 50560a73d2..10fce7fcc8 100644
--- a/kicad/CMakeLists.txt
+++ b/kicad/CMakeLists.txt
@@ -76,6 +76,7 @@ else()
     target_link_libraries( kicad
         common
         gal
+        common
         ${wxWidgets_LIBRARIES}
         ${GDI_PLUS_LIBRARIES}
         )
diff --git a/pcbnew/exporters/export_vrml.cpp b/pcbnew/exporters/export_vrml.cpp
index 67ab3c28d7..ac23fdf335 100644
--- a/pcbnew/exporters/export_vrml.cpp
+++ b/pcbnew/exporters/export_vrml.cpp
@@ -47,7 +47,6 @@
 #include "streamwrapper.h"
 #include "vrml_layer.h"
 #include "pcb_edit_frame.h"
-#include "kicad/kicad_manager_frame.h"
 
 #include <convert_basic_shapes_to_polygon.h>
 #include <geometry/geometry_utils.h>
diff --git a/pcbnew/router/length_tuner_tool.cpp b/pcbnew/router/length_tuner_tool.cpp
index 0fbbbb3bfc..a8b34689e8 100644
--- a/pcbnew/router/length_tuner_tool.cpp
+++ b/pcbnew/router/length_tuner_tool.cpp
@@ -50,8 +50,8 @@ static TOOL_ACTION ACT_StartTuning( "pcbnew.LengthTuner.StartTuning",
         _( "New Track" ), _( "Starts laying a new track." ) );
 
 static TOOL_ACTION ACT_EndTuning( "pcbnew.LengthTuner.EndTuning", 
-        AS_CONTEXT, 
-        WXK_END,
+        AS_CONTEXT,
+        WXK_END, LEGACY_HK_NAME( "Stop laying the current track." ),
         _( "End Track" ), _( "Stops laying the current meander." ) );
 
 static TOOL_ACTION ACT_Settings( "pcbnew.LengthTuner.Settings",