Tweaks to ease local benching / testing / optimizing