keymap fixes