Tweaks for languages as well