Fix some save ZIP files bugs