Minor catalog adjustments for PostgreSQL 9.1