Fix dates
Change date format