Wizard bugfixes and such