Some Quick Wizard Changes