Fixing archivedir and unarchivedir