A couple more build fixes.

[#53229997]