Various dependency fixes