fix gotchas with pg 16&17