giza: fixes for inheritance issues