Some keymapping tweaks