Fixing a bunch with the onboarding flow