Tweaks to keymap