Benchmark specific fixes