Fixed bugs in archive_two_servers, retesting.