Music bugfixes