Onboarding issues fixed :)