More fixes to the wizard pages