[FOLD] Fix classic build more
[FOLD] Fix classic build
[FOLD] Fix classic build