Some wizard adjustments