More minor upgrades to the wizard