Further language tweaks