[PATCH] CCI fixes