Some Pom.xml updates