Fix no date issues