Multi-language support fixes