Tweaks to benchmarking setup.  passes make validate locally