Fix dependencies and related issues
6 files changed