More correction dor zlib and windows.