diff --git a/agents/meshcore.js b/agents/meshcore.js
index d006a0a5..8c7c46c3 100644
--- a/agents/meshcore.js
+++ b/agents/meshcore.js
@@ -1901,7 +1901,7 @@ function onTunnelData(data) {
                                         var that = this.that;
                                         if (u.Active.length > 0) {
                                             var username = '"' + u.Active[0].Domain + '\\' + u.Active[0].Username + '"';
-                                            sendConsoleText('Terminal: ' + username);
+                                            //sendConsoleText('Terminal: ' + username);
                                             if (require('win-virtual-terminal').supported) {
                                                 // ConPTY PseudoTerminal
                                                 that.httprequest._dispatcher = require('win-dispatcher').dispatch({ user: username, modules: [{ name: 'win-virtual-terminal', script: getJSModule('win-virtual-terminal') }], launch: { module: 'win-virtual-terminal', method: (that.httprequest.protocol == 9 ? 'StartPowerShell' : 'Start'), args: [cols, rows] } });
diff --git a/views/default.handlebars b/views/default.handlebars
index 0fb142a6..92972d9a 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -5566,9 +5566,12 @@
                 }
                 // Update the list of checked nodes
                 if (action == 1) {
-                    for (var i in nodes) { if (nodes[i].meshid == meshid) { checkedNodeids[nodes[i]._id] = 1; } }
+                    for (var i in nodes) { if ((nodes[i].meshid == meshid) && (nodes[i].v == true)) { checkedNodeids[nodes[i]._id] = 1; } }
                 } else if (action == 2) {
-                    for (var i in checkedNodeids) { if (getNodeFromId(i).meshid == meshid) { delete checkedNodeids[i]; } }
+                    for (var i in checkedNodeids) {
+                        var n = getNodeFromId(i);
+                        if ((n != null) && (n.meshid == meshid) && (n.v == true)) { delete checkedNodeids[i]; }
+                    }
                 }
             }
             //if (action == 3) { window.location = "multidesktop.aspx?mesh=" + meshid + "&auto=1"; }