Dependency fixes again