Audio fixes and cleanups