Adjustments to CarbonCore changes