[Scripts] Build fixup part 1