issue #22155: Fix a bunch of problems.