Some more pom fixes