Fixed some maven problems