More pom fixes