Fixed some consistency issues.