last fixes for the extraction.