Fixed some more inconsistencies