giza: make integration fix