[PATCH 0/2] more SRG/CCI ref fixups