Some changes to the Zip-file generation