Fix timestamps, add concurrency safety