Fixed some issues with audio
Cleanup