Audio fix

This probably will cause conflicts on top of Sebastian's pipeline refactor, but makes audio work on current master