PostgreSQL tweaks
Merge branch 'postgresql'