Tweaks and CI