Some fixes in LangPlugin