Improvements to RPC