Minors corrections on DataExtractionImpl