Bug fixes for benchmarking infrastructure.