More fixes to when to pull from the audio merger.