additional fixes to driver manipulations during recovery/retry turned on