Improve date handling.