More PG schema fixes