More improvements to wizards