diff --git a/plugins/c9.ide.collab/server/collab-server.js b/plugins/c9.ide.collab/server/collab-server.js
index 165e6b2e..71f80900 100644
--- a/plugins/c9.ide.collab/server/collab-server.js
+++ b/plugins/c9.ide.collab/server/collab-server.js
@@ -1058,7 +1058,7 @@ var lastSaveStarts = {};
 // Used to block concurrent edit updates while the document is being processed
 //
 //     { <key or document_id> : [{Function}] }
-var locks = {};
+var locks = Object.create(null);
 function lock(key, callback) {
     if (!locks[key]) {
         locks[key] = [];
diff --git a/plugins/c9.ide.keys/panel.js b/plugins/c9.ide.keys/panel.js
index 483a84a0..09f3b4d8 100644
--- a/plugins/c9.ide.keys/panel.js
+++ b/plugins/c9.ide.keys/panel.js
@@ -1,3 +1,4 @@
+/*global apf*/
 define(function(require, exports, module) {
     main.consumes = [
         "Panel", "ui", "menus", "panels", "commands", "tabManager", "layout",
@@ -156,16 +157,14 @@ define(function(require, exports, module) {
             // Focus the input field
             setTimeout(function() {
                 txtFilter.focus();
-            }, 10);
+            });
             
-            setTimeout(function() {
-                // Assign the dataprovider
-                tree.setDataProvider(ldSearch);
-                tree.selection.$wrapAround = true;
-                var val = settings.get("state/commandPanel/@value");
-                if (val)
-                    txtFilter.ace.setValue(val);
-            }, 200);
+            // Assign the dataprovider
+            tree.setDataProvider(ldSearch);
+            tree.selection.$wrapAround = true;
+            var val = settings.get("state/commandPanel/@value");
+            if (val)
+                txtFilter.ace.setValue(val);
         }
         
         /***** Methods *****/
diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js
index e0151bcb..77b9208f 100644
--- a/plugins/c9.ide.terminal/terminal.js
+++ b/plugins/c9.ide.terminal/terminal.js
@@ -166,7 +166,7 @@ define(function(require, exports, module) {
                     hotkey: "commands.openterminal",
                     onclick: function(e) {
                         tabs.open({
-                            active: true,
+                            focus: true,
                             pane: this.parentNode.pane,
                             editorType: "terminal"
                         }, function() {});