Tweaks to make CI runs happy