! Fix a couple remaining issues with PostgreSQL

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

! Fix a couple remaining issues with PostgreSQL