Fixed dependency resolution