Benchmarker fixes