Fixes for version issues in the POMs (mismerged in the last commit)