diff --git a/my_plugin/Solenoid_spindle/my_plugin.c b/my_plugin/Solenoid_spindle/my_plugin.c
index 5d2fcf3..1dc3bb8 100644
--- a/my_plugin/Solenoid_spindle/my_plugin.c
+++ b/my_plugin/Solenoid_spindle/my_plugin.c
@@ -53,7 +53,6 @@ static bool solenoid_spindle_select (spindle_ptrs_t *spindle)
         memcpy(&pwm_spindle, spindle, sizeof(spindle_ptrs_t));
         spindle->set_state = solenoid_set_state;
         spindle->cap.laser = Off;
-        sys.mode = Mode_Standard;
     }
 
     return on_spindle_select == NULL || on_spindle_select(spindle);
diff --git a/my_plugin/hpgl/hpgl.c b/my_plugin/hpgl/hpgl.c
index 880cd5d..75c2935 100644
--- a/my_plugin/hpgl/hpgl.c
+++ b/my_plugin/hpgl/hpgl.c
@@ -5,8 +5,8 @@
 #include "hpgl.h"
 #include "scale.h"
 
-#include "../grbl/hal.h"
-#include "../grbl/nuts_bolts.h"
+#include "grbl/hal.h"
+#include "grbl/nuts_bolts.h"
 
 extern const char *const charset0[256];
 extern const char *const charset173[256];
diff --git a/my_plugin/hpgl/motori.c b/my_plugin/hpgl/motori.c
index 01586d3..b76b6f6 100644
--- a/my_plugin/hpgl/motori.c
+++ b/my_plugin/hpgl/motori.c
@@ -52,10 +52,9 @@
 #include "hpgl.h"
 #include "motori.h"
 
-#include "../grbl/hal.h"
-#include "../grbl/protocol.h"
-#include "../grbl/motion_control.h"
-#include "../grbl/state_machine.h"
+#include "grbl/protocol.h"
+#include "grbl/motion_control.h"
+#include "grbl/state_machine.h"
 
 #define VERSION "v0.07"
 #define DC_VALUES_MAX 12