Wizard bug fixes

Fixes #1332
Fixes #1333 
See my answer on line 93
qt-project.org/doc/qt-4.8/objecttrees.html