diff --git a/editor/js/nodes.js b/editor/js/nodes.js
index 957bd6dd9..2d806ad90 100644
--- a/editor/js/nodes.js
+++ b/editor/js/nodes.js
@@ -533,10 +533,10 @@ RED.nodes = (function() {
     /**
      * Converts the current node selection to an exportable JSON Object
      **/
-    function createExportableNodeSet(set) {
+    function createExportableNodeSet(set, exportedSubflows, exportedConfigNodes) {
         var nns = [];
-        var exportedConfigNodes = {};
-        var exportedSubflows = {};
+        exportedConfigNodes = exportedConfigNodes || {};
+        exportedSubflows = exportedSubflows || {};
         for (var n=0;n<set.length;n++) {
             var node = set[n];
             if (node.type.substring(0,8) == "subflow:") {
@@ -550,7 +550,7 @@ RED.nodes = (function() {
                             subflowSet.push(n);
                         }
                     });
-                    var exportableSubflow = createExportableNodeSet(subflowSet);
+                    var exportableSubflow = createExportableNodeSet(subflowSet, exportedSubflows, exportedConfigNodes);
                     nns = exportableSubflow.concat(nns);
                 }
             }
diff --git a/nodes/core/core/75-exec.js b/nodes/core/core/75-exec.js
index ef4f7037a..f5e28d016 100644
--- a/nodes/core/core/75-exec.js
+++ b/nodes/core/core/75-exec.js
@@ -62,10 +62,15 @@ module.exports = function(RED) {
                     var arg = node.cmd;
                     if ((node.addpay === true) && msg.hasOwnProperty("payload")) { arg += " "+msg.payload; }
                     if (node.append.trim() !== "") { arg += " "+node.append; }
-                    // slice whole line by spaces (trying to honour quotes);
-                    arg = arg.match(/(?:[^\s"]+|"[^"]*")+/g);
+                    // slice whole line by spaces and removes any quotes since spawn can't handle them
+                    arg = arg.match(/(?:[^\s"]+|"[^"]*")+/g).map((a) => {
+                        if (/^".*"$/.test(a)) {
+                            return a.slice(1,-1)
+                        } else {
+                            return a
+                        }
+                    });
                     var cmd = arg.shift();
-                    if (/^".*"$/.test(cmd)) { cmd = cmd.slice(1,-1); }
                     /* istanbul ignore else  */
                     if (RED.settings.verbose) { node.log(cmd+" ["+arg+"]"); }
                     child = spawn(cmd,arg);
diff --git a/red/runtime/nodes/registry/loader.js b/red/runtime/nodes/registry/loader.js
index 124fd8e2e..817b18668 100644
--- a/red/runtime/nodes/registry/loader.js
+++ b/red/runtime/nodes/registry/loader.js
@@ -116,7 +116,7 @@ function loadNodeFiles(nodeFiles) {
         /* istanbul ignore else */
         if (nodeFiles.hasOwnProperty(module)) {
             if (nodeFiles[module].redVersion &&
-                !semver.satisfies(runtime.version().replace("-git",""), nodeFiles[module].redVersion)) {
+                !semver.satisfies(runtime.version().replace(/(\-[1-9A-Za-z-][0-9A-Za-z-\.]*)?(\+[0-9A-Za-z-\.]+)?$/,""), nodeFiles[module].redVersion)) {
                 //TODO: log it
                 runtime.log.warn("["+module+"] "+runtime.log._("server.node-version-mismatch",{version:nodeFiles[module].redVersion}));
                 continue;