Fixes in ZIP family.