Fixed music related bugs