Fix date issues