Audio fix + regression fix