issue #20676: Fix a couple things.