Maven integration fixes