Fixes to language management classes