fix cc issues