Fix inconsistencies between files