Minor fixes for zip filenames