More compile fixes

[#68591002]