Fixups for --build option addition