Fix formatting of date/time values