Various minor PG fixes