Fixup build