Audio switching fixes