Modify for msm-3.5 clang