Music bug fixes