Some improvements for custom keymaps