[Extract] Fixed up extractors