Fix dependency tree