! A few fixes related to previous PR

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

! A few fixes related to previous PR