Postgres specific fixes