Other dependency fixes.