Minor fixes to benchmarks