Concurrency and PG fixes