Some fixes with Dates and Times edge cases