diff --git a/package.json b/package.json
index 646ac61b..e74ae73a 100644
--- a/package.json
+++ b/package.json
@@ -67,7 +67,7 @@
         "c9.ide.language.javascript.infer": "#18acb93a3a",
         "c9.ide.language.jsonalyzer": "#4b329741b1",
         "c9.ide.language.codeintel": "#253ae15f5e",
-        "c9.ide.collab": "#9c8fec5d78",
+        "c9.ide.collab": "#bab99a8b38",
         "c9.ide.local": "#10eb45842a",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c0a13737ef",
diff --git a/plugins/c9.ide.plugins/loader.js b/plugins/c9.ide.plugins/loader.js
index 7ce2afb4..e025d3b9 100644
--- a/plugins/c9.ide.plugins/loader.js
+++ b/plugins/c9.ide.plugins/loader.js
@@ -92,9 +92,9 @@ define(function(require, exports, module) {
                         delete extraPackages[config.packagePath];
                     }
                 });
-                Object.keys(extraPackages).forEach(function(extraConfig) {
+                Object.keys(extraPackages).forEach(function(packagePath) {
                     console.warn("[c9.ide.loader] Package " 
-                        + extraConfig.packagePath + " should be installed, according "
+                        + packagePath + " should be installed, according "
                         + "to the database, but was not found on the filesystem. "
                         + "Try reinstalling it.");
                 });
diff --git a/plugins/c9.ide.ui/codebox.js b/plugins/c9.ide.ui/codebox.js
index 504a0aab..18eca48b 100644
--- a/plugins/c9.ide.ui/codebox.js
+++ b/plugins/c9.ide.ui/codebox.js
@@ -91,11 +91,13 @@ apf.codebox = function(struct, tagName) {
         var checkInitial = function() {
             var value = ace.getValue();
             if (value && ace.renderer.initialMessageNode) {
+                ace.renderer.off("afterRender", checkInitial);
                 dom.removeCssClass(ace.container, "ace_initialMsg");
                 ace.renderer.scroller.removeChild(ace.renderer.initialMessageNode);
                 ace.renderer.initialMessageNode = null;
             }
             else if (!value && !ace.renderer.initialMessageNode) {
+                ace.renderer.on("afterRender", checkInitial);
                 dom.addCssClass(ace.container, "ace_initialMsg");
                 var el = document.createElement("div");
                 el.className = "tb_textboxInitialMsg";
@@ -103,7 +105,6 @@ apf.codebox = function(struct, tagName) {
                 ace.renderer.initialMessageNode = el;
                 ace.renderer.scroller.appendChild(ace.renderer.initialMessageNode);
             }
-            
         };
         ace.on("input", checkInitial);