Build fix + some minor updates for audio