build: delegated build fixes