Attempting to fix artifact issues