Minor tweaks/fixes

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Whoops. How'd that get there?

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

Minor tweaks/fixes