Lang fixes

uuuups, sorry - it seems I haven't go through master first, so we have both previous branch and that one together - but hey, no worries, eh? ;)