extractor fixes