Fix dependency issues
2 files changed