Fix some dependency issues
2 files changed