More maven changes