Build improvements Link fixes [1]
PR: 86921, 86293 [1] Submitted by: Erik Greenwald <erik@smluc.org> (maintainer) Approved by: pav (mentor)