Audio fixes 2