More fixes for sound.