Minor changes to the language selection handling.