Some minor improvements for language swither