Fixes to pg2 updates