Fix minor inconsistencies.