More pom.xml polishing