changes to RPC recovery