Wizard bug fixes

Fixes #1332
Fixes #1333 
Because the static version doesn't provide an handle so I couldn't stop it upon calibrationCompleted