More language filed tweaks