keymap_switch fixes