and yet another round of dependency fixes