Archive and error fixes