A few more SQLite3 fixes

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

A few more SQLite3 fixes