Archiving fixes