Fixes for pom.xml