Fixed some bugs in the Music code