More Maven fixes