Some language tweaks