Fixes to benchmark.