[Hotkey] Several tweaks