Fixed some wizard code.