Changes to support PG9.2+