Fixes to POM