A couple of archiving-related fixes.