Fix date spans