Adjustments to wizard