Fixing more CC stuff