archive fixes