Improve audio switching