Small fixups to benchmarking
More random fixups in benchmarking script