More timestamp fixes.