Fix zip
Minor tweaks