Small fixes again in language function