tweaks to make benchmark_server better