Fixed issues with ZipFiles