Fixed dependency resolution errors