diff --git a/hardware/Arduino/35-arduino.html b/hardware/Arduino/35-arduino.html
index 4cd1fef1..90df533b 100644
--- a/hardware/Arduino/35-arduino.html
+++ b/hardware/Arduino/35-arduino.html
@@ -62,7 +62,7 @@
 
 <script type="text/x-red" data-template-name="arduino out">
     <div class="form-row">
-        <label for="node-input-arduino"><i class="fa fa-tasks"></i> <span data-i18n="arduino.label.arduino"></span></label>
+        <label for="node-input-arduino"><i class="fa fa-tasks"></i> Arduino</label>
         <input type="text" id="node-input-arduino">
     </div>
     <div class="form-row">
diff --git a/hardware/Arduino/35-arduino.js b/hardware/Arduino/35-arduino.js
index ec0d1096..b3169106 100644
--- a/hardware/Arduino/35-arduino.js
+++ b/hardware/Arduino/35-arduino.js
@@ -68,10 +68,10 @@ module.exports = function(RED) {
         this.arduino = n.arduino;
         this.serverConfig = RED.nodes.getNode(this.arduino);
         this.running = false;
+        var node = this;
         if (typeof this.serverConfig === "object") {
             var startup = function() {
-                this.board = this.serverConfig.board;
-                var node = this;
+                node.board = node.serverConfig.board;
                 node.oldval = "";
                 node.status({fill:"grey",shape:"ring",text:"node-red:common.status.connecting"});
                 var doit = function() {
@@ -119,12 +119,12 @@ module.exports = function(RED) {
                 }
                 if (node.board.isReady) { doit(); }
                 else { node.board.once("ready", function() { doit(); }); }
-                setTimeout(function() { if (!node.running) { startup(); } }, 4500);
+                setTimeout(function() { if (node.running === false) { startup(); } }, 4500);
             }
             startup();
         }
         else {
-            this.warn(RED._("arduino.errors.portnotconf"));
+            node.warn(RED._("arduino.errors.portnotconf"));
         }
         node.on('close', function() {
             node.running = false;
diff --git a/hardware/Arduino/package.json b/hardware/Arduino/package.json
index e75017ac..77d1dd66 100644
--- a/hardware/Arduino/package.json
+++ b/hardware/Arduino/package.json
@@ -1,6 +1,6 @@
 {
     "name"          : "node-red-node-arduino",
-    "version"       : "0.2.1",
+    "version"       : "0.2.2",
     "description"   : "A Node-RED node to talk to an Arduino running firmata",
     "dependencies"  : {
         "firmata"   : "^2.0.0"