Bug fixes related to lang selection