More fixes for maven