fix some extractor stuff