Fixed some end date issues