Fixing issues identified by @lefticus in code review

[#68761808]