Fixed support of batch rpc calls