Minor changes to wizard