Minor pom enhancements