Don't add password parameters in ArtifactHit, small cleanups