DebugGraph: more improvements