Changes to the date conversion to set dates when in supported range,