Last few fixes for intro wizard.