More pom improvements