More fixes for language switching in multilingual configuration