Tweaks to benchmark