[Wizard] bugfixes