New fixes for maven problems...