MusicXML more fixes