bug fixes for hotkeys