Bugfixes during onboarding