Wizard improvements