Fix maven problems