Fix various issues with benchmark scripts

172 jobs for fix-benchmarks
latest