Fix zip step for flattened tools