Fix rpc checks.