Wizard bug fixes

Fixes #1332
Fixes #1333 
Can you share your concerns regarding the present code? It doesn't need to be manually destroyed the framework will take care of it.
The only race condition I can see happening here is the calibration taking 20 seconds and fire "Completed" at the same time as the timer. Can you imagine calibration taking 20 seconds?