Consistency issues fixed