Fixing some consistency issues.