Changes for new zlib.