Some fixes to get rid of adm-zip dependency due to installation problems.