Improved --fix-dates