build fixups