More dependency fixes