Tweaks to audio shutdown handling