Some fixes to the keymap