Maven dependencies fixes