Fix zip handling