Fixed timestamp issues.