Fixed Audio Bugs cause by my prior Merge