Fix some warnings
Merge branch 'postgres' into postgres-fay