Fix a few bugs in the wizard