Language and consistency tweaks