Fix inconsistencies