diff --git a/workspace-grid@hernejj/files/workspace-grid@hernejj/GridStyle.js b/workspace-grid@hernejj/files/workspace-grid@hernejj/GridStyle.js
index 6b6d0f642f7..9a2b7f18752 100644
--- a/workspace-grid@hernejj/files/workspace-grid@hernejj/GridStyle.js
+++ b/workspace-grid@hernejj/files/workspace-grid@hernejj/GridStyle.js
@@ -93,7 +93,7 @@ GridStyle.prototype = {
         this.table = new St.Table({homogeneous: false, reactive: true });
         this.applet.actor.add(this.table);
         
-        btn_height = this.height/this.rows;
+        let btn_height = this.height/this.rows;
         this.button = [];
         for(let r=0; r < this.rows; r++) {
             for(let c=0; c < this.cols; c++) {
diff --git a/workspace-grid@hernejj/files/workspace-grid@hernejj/applet.js b/workspace-grid@hernejj/files/workspace-grid@hernejj/applet.js
index d321fd56f08..961e0e204ae 100644
--- a/workspace-grid@hernejj/files/workspace-grid@hernejj/applet.js
+++ b/workspace-grid@hernejj/files/workspace-grid@hernejj/applet.js
@@ -27,15 +27,15 @@ if (typeof require !== 'undefined') {
 function registerKeyBindings(registerUpDownKeyBindings) {
     try {
         if (registerUpDownKeyBindings) {
-            Meta.keybindings_set_custom_handler('switch-to-workspace-up', Lang.bind(this, switchWorkspace));
-            Meta.keybindings_set_custom_handler('switch-to-workspace-down', Lang.bind(this, switchWorkspace));
+            Meta.keybindings_set_custom_handler('switch-to-workspace-up', switchWorkspace);
+            Meta.keybindings_set_custom_handler('switch-to-workspace-down', switchWorkspace);
         }
         else {
             Meta.keybindings_set_custom_handler('switch-to-workspace-up', Lang.bind(Main.wm, Main.wm._showWorkspaceSwitcher));
             Meta.keybindings_set_custom_handler('switch-to-workspace-down', Lang.bind(Main.wm, Main.wm._showWorkspaceSwitcher));
         }
-        Meta.keybindings_set_custom_handler('switch-to-workspace-left', Lang.bind(this, switchWorkspace));
-        Meta.keybindings_set_custom_handler('switch-to-workspace-right', Lang.bind(this, switchWorkspace));
+        Meta.keybindings_set_custom_handler('switch-to-workspace-left', switchWorkspace);
+        Meta.keybindings_set_custom_handler('switch-to-workspace-right', switchWorkspace);
     }
     catch (e) {
         global.log("workspace-grid@hernejj: Registering keybindings failed!");