Further tweakage for CI