Hand-check and update remaining error recovery checks