Fixed all the problems with the dates