Some minor POM cleanups