More keybinding tweaks