Fixes in main pom.xml