Fixes to make benchmarks more reliable