diff --git a/docs/source/extending/keymaps.rst b/docs/source/extending/keymaps.rst
index 9d1268040..cceac75c9 100644
--- a/docs/source/extending/keymaps.rst
+++ b/docs/source/extending/keymaps.rst
@@ -3,8 +3,8 @@ Customize keymaps
 
 .. note::
 
-    DEclarative Custom Keymaps is a provisional feature with unstable API which is not
-    guarantied to be keep in future versions odf the notebook, and can be
+    Declarative Custom Keymaps is a provisional feature with unstable API which is not
+    guaranteed to be kept in future versions of the notebook, and can be
     removed or changed without warnings. 
 
 The notebook shortcuts that are defined by jupyter both in edit mode an command
diff --git a/notebook/static/base/js/keyboard.js b/notebook/static/base/js/keyboard.js
index 30d6cf664..32c8dceca 100644
--- a/notebook/static/base/js/keyboard.js
+++ b/notebook/static/base/js/keyboard.js
@@ -408,7 +408,6 @@ define([
          *  The shortcut error should be explicit here, because it will be
          *  seen by users.
          */
-        var that = this;
         try {
           this._remove_leaf(shortcut, this._shortcuts);
           if (!suppress_help_update) {
diff --git a/notebook/static/notebook/js/keyboardmanager.js b/notebook/static/notebook/js/keyboardmanager.js
index f786906dc..4edb29935 100644
--- a/notebook/static/notebook/js/keyboardmanager.js
+++ b/notebook/static/notebook/js/keyboardmanager.js
@@ -51,7 +51,7 @@ define([
             var edit_unbind;
 
             try {
-                edit_unbind = that.config.data.keys.edit.unbind;
+                edit_unbind = that.config.data.keys.edit.unbind||[];
             } catch (e) {
                 if (e instanceof TypeError) {
                     edit_unbind = [];
@@ -65,7 +65,7 @@ define([
             var command_unbind;
 
             try {
-                command_unbind = that.config.data.keys.command.unbind;
+                command_unbind = that.config.data.keys.command.unbind||[];
             } catch (e) {
                 if (e instanceof TypeError) {
                     command_unbind = [];