keymaps fixes