fixes to stay in sync with motionbank/piecemaker2-api@45d5b89cccd2c879a3b08a15bc2e9c8a087787e0