Fixes to audio switching