Add nulls last to onboarding.