Re: [PATCH 0/8] repairs/improvements to CCI refs