Keyboard keybinding fixes