Third time's the charm + pom.xml fixes