fix #30686
fix #24725
Merge pull request #1311 from lvinken/musicxml-fixes

Musicxml fixes