Fixes to the Extract task