Merge Core Audio fixes