More multilingual enhancements