Fix: First run experience that works