Temporal fixes

Updating my previous pull request to be more in line with ISO 8601.