Misc upgrades

Conflicts:
	pom.xml