Fixed dependency resolution issues