Additional hotkey fixes