diff --git a/app/assets/javascripts/editor.js.erb b/app/assets/javascripts/editor.js.erb
index cff00332..e4f66c4c 100644
--- a/app/assets/javascripts/editor.js.erb
+++ b/app/assets/javascripts/editor.js.erb
@@ -4,13 +4,15 @@ $(function() {
   //TODO Change this. Otherwise it will fuck people up,
   //because it's really confusing if the variables and the code are
   //split over 6 files.
-  $.extend(CodeOceanEditor,
+  $.extend(
+      CodeOceanEditor,
       CodeOceanEditorAJAX,
       CodeOceanEditorEvaluation,
       CodeOceanEditorFlowr,
       CodeOceanEditorSubmissions,
       CodeOceanEditorTurtle,
-      CodeOceanEditorWebsocket);
+      CodeOceanEditorWebsocket
+  );
 
   if ($('#editor').isPresent() && CodeOceanEditor) {
     if (CodeOceanEditor.isBrowserSupported()) {
diff --git a/app/assets/javascripts/editor/editor.js.erb b/app/assets/javascripts/editor/editor.js.erb
index b16892ff..ab673983 100644
--- a/app/assets/javascripts/editor/editor.js.erb
+++ b/app/assets/javascripts/editor/editor.js.erb
@@ -204,7 +204,7 @@ var CodeOceanEditor = {
       if (this.qa_api) {
         editor.getSession().on("change", function (deltaObject) {
           this.qa_api.executeCommand('syncEditor', [this.active_file, deltaObject]);
-        });
+        }.bind(this));
       }
 
       var document = editor.getSession().getDocument();