Fix dependency resolution