Make timestamps consistent