Wizard bug fixes

Fixes #1332
Fixes #1333