Fixed some issues with wizard.