More benchmarking changes