Fixed some inconsistencies.