fix #34781
fix #35146
Merge pull request #1351 from lvinken/more-musicxml-fixes

More musicxml fixes