[WIP][FOLD] Fix compilation errors