Slight benchmarking tweaks