Fixing some build errors.

[#54066093]
[#54074653]