Fix date formatting issues
Merge branch 'fix-date-format'