fix ObjC++ and arm64 problems