Small ci upgrades