issue #21894: Fix address problems.