WIP dependency fixes.