Finish fixing ISO8601 time format