Added some minor improvements to hotkeys.