Small changes. I think Alex fixed the problem I am now seeing, so my next commit will be a merge from develop.

[#55741640]