Fixing some compiler errors, a few linker errors remain

[#60055098]