More PG fixes...