Fix inconsistances