Several pom.xml improvements suggested by tbroyer