Fixing a few things w/ the initial pull of artifacts