[FOLD] gcc fixes
[FOLD] gcc fixes