Various fixes to push audio vaguely in the right direction.