Various pom.xml updates