Dependency fixes