Some keymapping fixes