fixup: small follow-up fixes to a659c54