Fixing regressions on RPC layer