more gz fixes