Fixing minor bugs in wizard.