A few small things

Some adjustments for Euterpea compatibility (and because they're good
adjustments)