! A few more PostgreSQL fixes

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

! A few more PostgreSQL fixes