More or less fix keybindings, again