Tweaks to see if it helps the last build failure...