[^]#master fixes in pg