Cleaning up more inconsistencies