Couple of language tweaks