New changes needed for msm-3.5 clang