Fixes and cleanup in pom.xml files.