Work to fix conversion wizards