issue #20254: more tweaks to script