More work to fix conversion wizards