diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 932d516b..ed148868 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -134,10 +134,10 @@ copy({
     //filter: copy.filter.uglifyjs,
     dest: 'build/ace.js'
 });
-copy({
-    source: data,
-    dest: 'build/ace-uncompressed.js'
-});
+//copy({
+//    source: data,
+//    dest: 'build/ace-uncompressed.js'
+//});
 
 copy({
     source: [
@@ -151,7 +151,7 @@ copy({
 copy({
     source: "lib/ace/worker/worker.js",
     filter: [function(data) {
-        return data + "\nimportScripts('ace-uncompressed.js')";
+        return data + "\nimportScripts('ace.js')";
     }],
     dest: 'build/worker.js'
 });
diff --git a/build_support/boot.js b/build_support/boot.js
index 5e3945b6..66733344 100644
--- a/build_support/boot.js
+++ b/build_support/boot.js
@@ -42,6 +42,7 @@ if (window.document) {
     require("pilot/settings");
     
     var Event = require("pilot/event");
+    var Dom = require("pilot/dom");
     var EditSession = require("ace/edit_session").EditSession;
     var JavaScriptMode = require("ace/mode/javascript").Mode;
     var UndoManager = require("ace/undomanager").UndoManager;
@@ -59,7 +60,7 @@ if (window.document) {
                 el = document.getElementById(el);
             }
             
-            var doc = new EditSession(el.innerHTML);
+            var doc = new EditSession(Dom.getInnerText(el));
             doc.setMode(new JavaScriptMode());
             doc.setUndoManager(new UndoManager());
             el.innerHTML = '';
diff --git a/build_support/editor.html b/build_support/editor.html
index bcfa964c..e7c024e3 100644
--- a/build_support/editor.html
+++ b/build_support/editor.html
@@ -17,7 +17,7 @@
     }
 }</div>
     
-<script src="ace-uncompressed.js" type="text/javascript" charset="utf-8"></script>
+<script src="ace.js" type="text/javascript" charset="utf-8"></script>
 <script src="theme/twilight.js" type="text/javascript" charset="utf-8"></script>
 <script>
 document.addEventListener("DOMContentLoaded", function() {
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index 06176eb7..99a43894 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -643,7 +643,7 @@ var VirtualRenderer = function(container, theme) {
     };
 
     this.setCompositionText = function(text) {
-        this.$composition.innerText = this.$composition.textContent = text;
+        dom.setInnerText(this.$composition, text);
     };
 
     this.hideComposition = function() {