DDF-851 Few minor changes per code review - using the dependency management at the top level.