Normalize timestamps at the right time