More Maven updates