Correction extraction and add Ubuntu support