Dependency management fixes