More zlib/mingw fixes (hopefully the last!)