Fix timestamp issues