Add fixes for multi-language support