! Fix a couple issues with previous PR

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

! Fix a couple issues with previous PR