! Fix some undefined errors (fixes #1742)

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

! Fix some undefined errors (fixes #1742)