Some keybinding tweaks