Re: [PATCH] CCI fixes