Fix more inconsistencies.