RFC101 fixups (#4713)

[ci skip]