Fixed consistency issues.