Some more Maven related changes.