giza: fixes to enable inheritance to work