Fixed some maven issues