Updates for PG 3.6