Fix more minor inconsistencies