More language tweaks