Cart page CC stuff fixes