Revert "Fixes"

This reverts commit 21bde6db106a1dd0bb5096ad22fb64593df7d30a.
PG fix