Fixed couple issues with archiving