Fix issues with pom.xml