Corrections in preparation of the pull request (POM diff was not as expected).