Clean up
Fix build
Another try to fix PostgreSQL