Some small fix on dependency graph