diff --git a/editor/js/history.js b/editor/js/history.js
index dd5956e38..af7ae2507 100644
--- a/editor/js/history.js
+++ b/editor/js/history.js
@@ -33,6 +33,7 @@ RED.history = (function() {
             var ev = undo_history.pop();
             var i;
             var node;
+            var subflow;
             var modifiedTabs = {};
             if (ev) {
                 if (ev.t == 'add') {
@@ -73,7 +74,7 @@ RED.history = (function() {
                             });
                         }
                         if (ev.subflow.hasOwnProperty('changed')) {
-                            var subflow = RED.nodes.subflow(ev.subflow.id);
+                            subflow = RED.nodes.subflow(ev.subflow.id);
                             if (subflow) {
                                 subflow.changed = ev.subflow.changed;
                             }
@@ -89,7 +90,6 @@ RED.history = (function() {
                     if (ev.subflow && ev.subflow.subflow) {
                         RED.nodes.addSubflow(ev.subflow.subflow);
                     }
-                    var subflow;
                     if (ev.subflowInputs && ev.subflowInputs.length > 0) {
                         subflow = RED.nodes.subflow(ev.subflowInputs[0].z);
                         subflow.in.push(ev.subflowInputs[0]);
diff --git a/editor/js/ui/editor.js b/editor/js/ui/editor.js
index edbe0d3c5..bcb9f553c 100644
--- a/editor/js/ui/editor.js
+++ b/editor/js/ui/editor.js
@@ -271,8 +271,9 @@ RED.editor = (function() {
                                     RED.nodes.dirty(true);
 
                                     var activeSubflow = RED.nodes.subflow(RED.workspaces.active());
+                                    var subflowInstances = null;
                                     if (activeSubflow) {
-                                        var subflowInstances = [];
+                                        subflowInstances = [];
                                         RED.nodes.eachNode(function(n) {
                                             if (n.type == "subflow:"+RED.workspaces.active()) {
                                                 subflowInstances.push({
diff --git a/editor/js/ui/view.js b/editor/js/ui/view.js
index 39b189270..5ab3c5a20 100644
--- a/editor/js/ui/view.js
+++ b/editor/js/ui/view.js
@@ -754,6 +754,7 @@ RED.view = (function() {
         redraw();
     }
     function deleteSelection() {
+        var result;
         var removedNodes = [];
         var removedLinks = [];
         var removedSubflowOutputs = [];
@@ -784,14 +785,14 @@ RED.view = (function() {
                 }
             }
             if (removedSubflowOutputs.length > 0) {
-                var result = RED.subflow.removeOutput(removedSubflowOutputs);
+                result = RED.subflow.removeOutput(removedSubflowOutputs);
                 if (result) {
                     removedLinks = removedLinks.concat(result.links);
                 }
             }
             // Assume 0/1 inputs
             if (removedSubflowInputs.length == 1) {
-                var result = RED.subflow.removeInput();
+                result = RED.subflow.removeInput();
                 if (result) {
                     removedLinks = removedLinks.concat(result.links);
                 }