File zip fixes