Dependency fixes
3 files changed