Little fixups for CI