Fix DebugItems in the new builder stuff