Fixing the keybindings