Soundtrack fixes / cleanup