CI tweaks