Directive Injector: fix last commit to master

- the first commit fix the master branch,
- the second commits implement some feedback that was discussed on the PR

@rkirov could you please review this.