! A few more 2.0.9 related fixes...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2386 from Oldiesmann/release-2.1

! A few more 2.0.9 related fixes...