CS fixes for zlib.nim