[FOLD] container clang fixes