Various fixes to the Wizard.