Fixes to Archives refactor