Wizard flow bugs fixed