Pom improvements.
More pom improvements.