giza: minor fixes