Onboarding fixes