diff --git a/node_modules/ace/lib/ace/mode/xml.js b/node_modules/ace/lib/ace/mode/xml.js
index 8c7033f1..38861eee 100644
--- a/node_modules/ace/lib/ace/mode/xml.js
+++ b/node_modules/ace/lib/ace/mode/xml.js
@@ -53,7 +53,7 @@ oop.inherits(Mode, TextMode);
 
     this.blockComment = {start: "<!--", end: "-->"};
 
-     this.createWorker = function(session) {
+    this.createWorker = function(session) {
         var worker = new WorkerClient(["ace"], "ace/mode/xml_worker", "Worker");
         worker.attachToDocument(session.getDocument());
 
diff --git a/plugins/c9.ide.plugins/debug.js b/plugins/c9.ide.plugins/debug.js
index 2f2c3e87..2234d1f9 100644
--- a/plugins/c9.ide.plugins/debug.js
+++ b/plugins/c9.ide.plugins/debug.js
@@ -41,6 +41,7 @@ define(function(require, exports, module) {
         var HASSDK = c9.location.indexOf("sdk=0") === -1;
         
         var reParts = /^(builders|keymaps|modes|outline|runners|snippets|themes)\/(.*)/
+        var reModule = /(?:_highlight_rules|_test|_worker|_worker_test|_fold|_fold_test|_behaviou?r|_behaviou?r_test).js$/
         
         var loaded = false;
         function load() {
@@ -236,6 +237,9 @@ define(function(require, exports, module) {
                 var filename = RegExp.$2;
                 if (filename.indexOf("/") > -1) return;
                 
+                if (type == "module" && filename.match(reModule))
+                    return;
+                
                 parallel.push(function(next){
                     fs.readFile(join(path, filename), function(err, data){
                         if (err) {