Fix a few bugs related to #623

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Oops

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

Fix a few bugs related to #623