More Pom Fixes