Tweaks for Maven #2