Some minor corrections
Merge pull request #1087 from jrogelstad/21508-WorkOrder

Some minor corrections
Issue #21992: merged conflicts