Minor tweaks to pom.xml
A few more changes...