Benchmark fixups.