Fixes to gzip build