Fix up RPC corpus