Fixed date issues