Few tweaks to LanguageManager.