build: fixes for giza compatibility