Bug fixes for Archive