Dependency resolution fixes.