CC fixes