Merge "Fix Postgres support"