Fix c6000 build issues