diff --git a/igzip/adler32_base.c b/igzip/adler32_base.c
index 504b8b12..bc0818ab 100644
--- a/igzip/adler32_base.c
+++ b/igzip/adler32_base.c
@@ -31,7 +31,7 @@
 #include "igzip_checksums.h"
 
 uint32_t
-adler32_base(uint32_t adler32, uint8_t *start, uint32_t length)
+adler32_base(uint32_t adler32, uint8_t *start, uint64_t length)
 {
         uint8_t *end, *next = start;
         uint64_t A, B;
diff --git a/igzip/igzip_base_aliases.c b/igzip/igzip_base_aliases.c
index 93240b3f..7de2e40f 100644
--- a/igzip/igzip_base_aliases.c
+++ b/igzip/igzip_base_aliases.c
@@ -59,9 +59,10 @@ extern void
 isal_deflate_hash_base(uint16_t *, uint32_t, uint32_t, uint8_t *, uint32_t);
 
 void
-set_long_icf_fg_base(uint8_t *next_in, uint8_t *end_in, struct deflate_icf *match_lookup,
-                     struct level_buf *level_buf);
-void
+set_long_icf_fg_base(uint8_t *next_in, uint64_t processed, uint64_t input_size,
+                     struct deflate_icf *match_lookup);
+
+uint64_t
 gen_icf_map_h1_base(struct isal_zstream *stream, struct deflate_icf *matches_icf_lookup,
                     uint64_t input_size);
 
@@ -167,15 +168,15 @@ isal_deflate_hash_lvl3(uint16_t *hash_table, uint32_t hash_mask, uint32_t curren
 }
 
 void
-set_long_icf_fg(uint8_t *next_in, uint8_t *end_in, struct deflate_icf *match_lookup,
-                struct level_buf *level_buf)
+set_long_icf_fg(uint8_t *next_in, uint64_t processed, uint64_t input_size,
+                struct deflate_icf *match_lookup)
 {
-        set_long_icf_fg_base(next_in, end_in, match_lookup, level_buf);
+        set_long_icf_fg_base(next_in, processed, input_size, match_lookup);
 }
 
-void
+uint64_t
 gen_icf_map_lh1(struct isal_zstream *stream, struct deflate_icf *matches_icf_lookup,
                 uint64_t input_size)
 {
-        gen_icf_map_h1_base(stream, matches_icf_lookup, input_size);
+        return gen_icf_map_h1_base(stream, matches_icf_lookup, input_size);
 }
diff --git a/igzip/igzip_icf_body.c b/igzip/igzip_icf_body.c
index faa4156f..e3f8bbed 100644
--- a/igzip/igzip_icf_body.c
+++ b/igzip/igzip_icf_body.c
@@ -4,7 +4,7 @@
 #include "igzip_level_buf_structs.h"
 
 extern uint64_t
-gen_icf_map_lh1(struct isal_zstream *, struct deflate_icf *, uint32_t);
+gen_icf_map_lh1(struct isal_zstream *, struct deflate_icf *, uint64_t);
 extern void
 set_long_icf_fg(uint8_t *, uint64_t, uint64_t, struct deflate_icf *);
 extern void