build fixup