Hotfixes for MUSIO-22