Merge "Fixed some audio helper functions"