Small fixes to benchmarking code