Dates issues solved