Audio fixes for previous commit