Fix unzipping and patching