language support tweaks