UHM-1597 - Fixed some date corner cases