Minor improvements to hotkeys...