And some more pom.xml corrections