Add overflow fixes to unzip