Fix for #933 issue

This PR fixes #933, and some minor glitches detailed in the commit messages.
It is used here :  /** @var StandardServiceContainer $serviceContainer */