Minor changes for PG