zip creation fixups