Fixed maven issues