More fixes to Maven