Fixing compilation errors in CC