Fix yard tag warnings

[#46491831]