cherry-pick minor fixes
Source for buildrump.sh git rev 927e6837829f56440a3f06c2cad3649ac898e8d1