Fix timestamps