Fix up benchmarking setup