Fix parts of some possible loops with old XCFs