RPC errors fixed