Fixing unzip issues