Fixed some archive issues