rpc: conform to new API