CI: additional tweaks