[FOLD] gcc fixes