Fix timestamp issues.