Fix pom issues