Fixes for POM.xml