Fixes and changes in POM