Fixing a couple issues found with running PATTest.

[#53230709]