Packaging fixes for zlib