Fixed various issues with the benchmarking script