Multilingual support fixes