A few minor fixes
Merge branch 'postgres' into postgres-fay