Onboarding tweaks [Pending]