Fixed POM issues