Fix rpc calls