Dependency fixes.