Fix dependency sorting