Fixed some problems with wizard mode