Multi-language fixes