Small fixes to easier run benchmarks