several extractor fixes