diff --git a/.gitmodules b/.gitmodules
index 5c78725c..4678c516 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -3,4 +3,4 @@
 	url = git://github.com/ajaxorg/ace.wiki.git
 [submodule "build"]
 	path = build
-	url = https://github.com/ajaxorg/ace-builds.git
+	url = git://github.com/ajaxorg/ace-builds.git
diff --git a/Readme.md b/Readme.md
index b8024df7..e55ef505 100644
--- a/Readme.md
+++ b/Readme.md
@@ -25,9 +25,9 @@ Features
 Take Ace for a spin!
 --------------------
 
-Check out the Ace live [demo](http://ajaxorg.github.com/ace-builds/kitchen-sink.html) or get a [Cloud9 IDE account](http://c9.io) to experience Ace while editing one of your own GitHub projects.
+Check out the Ace live [demo](http://ajaxorg.github.com/ace/build/kitchen-sink.html) or get a [Cloud9 IDE account](http://c9.io) to experience Ace while editing one of your own GitHub projects.
 
-If you want, you can use Ace as a textarea replacement thanks to the [Ace Bookmarklet](http://ajaxorg.github.com/ace-builds/textarea/editor.html).
+If you want, you can use Ace as a textarea replacement thanks to the [Ace Bookmarklet](http://ajaxorg.github.com/ace/build/textarea/editor.html).
 
 Getting the code
 ----------------
@@ -123,7 +123,7 @@ The editor can then be opened at http://localhost:8888/kitchen-sink.html.
 Package Ace
 -----------
 
-To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. (see the [wiki](https://github.com/ajaxorg/ace/wiki/Building-ace) more for details)
+To package Ace we use the dryice build tool developed by the Mozilla Skywriter team. (see the [wiki](https://github.com/ajaxorg/ace/wiki/Building-ace) for more details)
 
 ```bash
     npm install
diff --git a/index.html b/index.html
index 911f5c97..a463d535 100644
--- a/index.html
+++ b/index.html
@@ -116,7 +116,7 @@
  
                     <h2>Take Ace for a spin!</h2> 
                     <div class="divider"></div> 
-<p>Check out the <a href="http://ajaxorg.github.com/ace-builds/kitchen-sink.html">Ace live demo</a> or get a <a href="http://c9.io">Cloud9 IDE account</a> to experience Ace while editing one of your own GitHub projects.</p> 
+<p>Check out the <a href="./build/kitchen-sink.html">Ace live demo</a> or get a <a href="http://c9.io">Cloud9 IDE account</a> to experience Ace while editing one of your own GitHub projects.</p> 
  
                     <h2>History</h2> 
                     <div class="divider"></div> 
diff --git a/lib/ace/keyboard/textinput.js b/lib/ace/keyboard/textinput.js
index e4ba3e1c..49c93116 100644
--- a/lib/ace/keyboard/textinput.js
+++ b/lib/ace/keyboard/textinput.js
@@ -206,7 +206,7 @@ var TextInput = function(parentNode, host) {
         });
         event.addListener(text, "cut", onCut); // for ie9 context menu
     }
-    else if (useragent.isOpera) {
+    else if (useragent.isOpera && !("KeyboardEvent" in window)) {
         event.addListener(parentNode, "keydown", function(e) {
             if ((useragent.isMac && !e.metaKey) || !e.ctrlKey)
                 return;
diff --git a/lib/ace/lib/event_emitter.js b/lib/ace/lib/event_emitter.js
index ef1e25a0..5818864d 100644
--- a/lib/ace/lib/event_emitter.js
+++ b/lib/ace/lib/event_emitter.js
@@ -54,7 +54,8 @@ EventEmitter._dispatchEvent = function(eventName, e) {
         return;
 
     e = e || {};
-    e.type = eventName;
+    if (!e.type)
+        e.type = eventName;
     
     if (!e.stopPropagation) {
         e.stopPropagation = function() {
diff --git a/package.json b/package.json
index bfe31c80..b7a4b097 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
     "version": "0.2.0",
     "homepage" : "http://github.com/ajaxorg/ace",
-    "engines": {"node": ">= 0.4.0"},
+    "engines": {"node": ">= 0.6.0"},
     "author": "Fabian Jakobs <fabian@ajax.org>",
     "main": "lib/ace",
     "repository" : {
@@ -19,9 +19,6 @@
         "dryice": "",
         "panino" : "~1.0.15"
     },
-    "engines": {
-      "node": "~0.6.0"
-    },
     "mappings": {
         "ace": "."
     },