Attempt to fix dependency resolution