scan retry fixes