diff --git a/src/avr/src/spindle.c b/src/avr/src/spindle.c
index 2be4a3b..9610329 100644
--- a/src/avr/src/spindle.c
+++ b/src/avr/src/spindle.c
@@ -33,6 +33,7 @@
 #include "config.h"
 #include "command.h"
 #include "exec.h"
+#include "estop.h"
 #include "util.h"
 #include "state.h"
 
@@ -94,6 +95,8 @@ static void _set_speed(float speed) {
 
   float power = _speed_to_power(speed);
 
+  if (estop_triggered()) power = 0;
+
   switch (spindle.type) {
   case SPINDLE_TYPE_DISABLED: break;
 
diff --git a/src/js/modbus-reg.js b/src/js/modbus-reg.js
index 464dcf0..2ce5e78 100644
--- a/src/js/modbus-reg.js
+++ b/src/js/modbus-reg.js
@@ -8,7 +8,7 @@ module.exports = {
     computed: {
         has_user_value: function() {
             const type = this.model["reg-type"];
-            return type.indexOf("write") != -1 || type.indexOf("fixed") != -1;
+            return type.includes("write") || type.includes("fixed") || type.includes("scaled");
         }
     },
 
diff --git a/src/pug/templates/tool-view.pug b/src/pug/templates/tool-view.pug
index 354fcc3..d6d51f4 100644
--- a/src/pug/templates/tool-view.pug
+++ b/src/pug/templates/tool-view.pug
@@ -43,7 +43,7 @@ script#tool-view-template(type="text/x-template")
           label.units RPM
 
       fieldset.modbus-program(
-        v-if="is_modbus && this.tool_type != 'HUANYANG VFD'")
+        v-if="is_modbus && tool_type != 'HUANYANG VFD' && tool_type != 'EM60'")
         h2 Active Modbus Program
         p(v-if="$root.modified")
           | (Click #[tt(class="save") Save] to activate the selected