Fix completion check and tarfile directory