Music section fixes