Fixed problems found from tests, refs #20287