Fix additional date issues