Fixes in pom.xml