@qiongyu, @nkarnik -- maybe fix local rpc

@qiongyu, @nkarnik -- maybe fix local rpc