Fix some dependencies and warnings in small config
5 files changed