Minor POM adjustments