[FOLD] clang fixes