Obvious fixes and dependency fixes.