Multi lang - more language-based tweaks