Another pom.xml fixes