More dependency fixes.