caveats: yosemite adjustments

Closes #33815

Hopefully…
Meh. I'll pull this as-is, seems more robust.