Fix audio routing (pt3)