Fixed some bugs with the multilanguage implementation