Fixed some date issues