archiving-related fixes