minor tweaks for newer base pom