Fixes for soundManager
Cleanup