artifactid fix + source fix