Fixed a deadlock when changing the song source
Some performance improvements