Fix issues with missed archive data