Minor POM updates and some small code cleanup