minor fixes and maven upgrades