Fixed a few consistency issues.