Adding missing changes to the extractor scripts.