Minor changes and fixes to the POM's.