fixed few issues related to wizard.