Fixed more inconsistencies.