[Scripts] Build fixup part 2