Handle timestamp skew