diff --git a/demo/kitchen-sink/demo.js b/demo/kitchen-sink/demo.js
index a9e2c011..a2a7fbc8 100644
--- a/demo/kitchen-sink/demo.js
+++ b/demo/kitchen-sink/demo.js
@@ -91,7 +91,7 @@ require("ace/multi_select").MultiSelect(env.editor);
 var consoleEl = dom.createElement("div");
 container.parentNode.appendChild(consoleEl);
 consoleEl.style.cssText = "position:fixed; bottom:1px; right:0;\
-border:1px solid #baf; zIndex:100";
+border:1px solid #baf; z-index:100";
 
 var cmdLine = new layout.singleLineEditor(consoleEl);
 cmdLine.editor = env.editor;
diff --git a/demo/kitchen-sink/util.js b/demo/kitchen-sink/util.js
index 337eaeb6..d2e32524 100644
--- a/demo/kitchen-sink/util.js
+++ b/demo/kitchen-sink/util.js
@@ -205,7 +205,7 @@ exports.fillDropdown = function(el, values) {
 function elt(tag, attributes, content) {
     var el = dom.createElement(tag);
     if (typeof content == "string") {
-        el.textContent = content;
+        el.appendChild(document.createTextNode(content));
     } else if (content) {
         content.forEach(function(ch) {
             el.appendChild(ch);
diff --git a/kitchen-sink.html b/kitchen-sink.html
index 90f1827e..bb534835 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -276,7 +276,7 @@
     </tr>
     <tr>
       <td colspan="2">
-        <input type="button" value="Edit Snippets", onclick="env.editSnippets()">
+        <input type="button" value="Edit Snippets" onclick="env.editSnippets()">
       </td>
     </tr>
   </table>
diff --git a/lib/ace/keyboard/vim/maps/motions.js b/lib/ace/keyboard/vim/maps/motions.js
index c3ee5518..91c8b8af 100644
--- a/lib/ace/keyboard/vim/maps/motions.js
+++ b/lib/ace/keyboard/vim/maps/motions.js
@@ -655,7 +655,7 @@ module.exports = {
 };
 
 module.exports.backspace = module.exports.left = module.exports.h;
-module.exports.space = module.exports.return = module.exports.right = module.exports.l;
+module.exports.space = module.exports['return'] = module.exports.right = module.exports.l;
 module.exports.up = module.exports.k;
 module.exports.down = module.exports.j;
 module.exports.pagedown = module.exports["ctrl-d"];