Fixing bugs in the wizard.