Fixing a few dependency issues in the conf definition.