Fix onboarding