Fixup rpc-endpoints (#16924)