A few more fixes

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

A few more fixes