File zip fixes

Change-Id: Ib48303452df5ae637a3d5f03c861f5240ed83617