more rpc fixes