keybindings: a couple of fixes