Benchmark fixes