Archive script fixes