Hotkey fixes