[PATCH 1/2] CCI ref fixup