ALM-633 some tweaks to the Postgres changes