Fix race condition, update benchmarks