Even more build/maven changes