diff --git a/lib/ace/edit_session/bracket_match.js b/lib/ace/edit_session/bracket_match.js
index cc634b5a..477125a1 100644
--- a/lib/ace/edit_session/bracket_match.js
+++ b/lib/ace/edit_session/bracket_match.js
@@ -38,7 +38,7 @@
 
 define(function(require, exports, module) {
 
-var TokenIterator = require("ace/token_iterator").TokenIterator;
+var TokenIterator = require("../token_iterator").TokenIterator;
 
 function BracketMatch() {
 
diff --git a/lib/ace/test/mockrenderer.js b/lib/ace/test/mockrenderer.js
index ad8a24d7..ae04eed2 100644
--- a/lib/ace/test/mockrenderer.js
+++ b/lib/ace/test/mockrenderer.js
@@ -58,6 +58,14 @@ MockRenderer.prototype.getLastVisibleRow = function() {
     return this.layerConfig.lastVisibleRow;
 };
 
+MockRenderer.prototype.getFirstFullyVisibleRow = function() {
+    return this.layerConfig.firstVisibleRow;
+};
+
+MockRenderer.prototype.getLastFullyVisibleRow = function() {
+    return this.layerConfig.lastVisibleRow;
+};
+
 MockRenderer.prototype.getContainerElement = function() {
     return this.container;
 };
diff --git a/lib/ace/token_iterator_test.js b/lib/ace/token_iterator_test.js
index 9950ef3c..a01f5da2 100644
--- a/lib/ace/token_iterator_test.js
+++ b/lib/ace/token_iterator_test.js
@@ -35,16 +35,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-if (typeof process !== "undefined") {
-    require("../../support/paths");
-}
+ if (typeof process !== "undefined") {
+     require("amd-loader");
+ }
 
 define(function(require, exports, module) {
 
-var EditSession = require("ace/edit_session").EditSession;
-var JavaScriptMode = require("ace/mode/javascript").Mode;
-var TokenIterator = require("ace/token_iterator").TokenIterator;
-var assert = require("ace/test/assertions");
+var EditSession = require("./edit_session").EditSession;
+var JavaScriptMode = require("./mode/javascript").Mode;
+var TokenIterator = require("./token_iterator").TokenIterator;
+var assert = require("./test/assertions");
 
 module.exports = {
     "test: token iterator initialization in JavaScript document" : function() {
diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js
index c7266e60..a75821aa 100644
--- a/lib/ace/virtual_renderer.js
+++ b/lib/ace/virtual_renderer.js
@@ -51,7 +51,7 @@ var CursorLayer = require("./layer/cursor").Cursor;
 var ScrollBar = require("./scrollbar").ScrollBar;
 var RenderLoop = require("./renderloop").RenderLoop;
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var editorCss = require("ace/requirejs/text!ace/css/editor.css");
+var editorCss = require("ace/requirejs/text!./css/editor.css");
 
 var VirtualRenderer = function(container, theme) {
     this.container = container;