Tweaks to make yogi benchmark a bit more happy in CI environments.