Fixed inconsistencies between the two files