Some extractor fixes