CI tweaks...