Handle snapshot artifacts properly