Extractor Wizard fixes