Fix fci and company.