[46283/46493] Launcher: More fixes