Fix dependency graph & config.extra