benchmarking fixes