Fixed a couple of inconsistencies.