Fixed archive issues