Fixes to POM some cleanup