issue #19453: Lots more fixes.
Merge pull request #153 from jrogelstad/19453

issue #19453: Lots more fixes.