Refix pg commands