More music bugfixing.